Author: rwesten
Date: Mon Sep 17 13:25:11 2012
New Revision: 1386604
URL: http://svn.apache.org/viewvc?rev=1386604&view=rev
Log:
STANBOL-706: reintegrated the DBpedia Spotlight Engine to the Stanbol Trunk
Added:
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/ (props
changed)
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/pom.xml
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/pom.xml
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/license/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/license/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/license/THIRD-PARTY.properties
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/license/THIRD-PARTY.properties
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/Annotation.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/Annotation.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/CandidateResource.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/CandidateResource.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/XMLParser.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/XMLParser.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/metatype/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/metatype/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/metatype/metatype.properties
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/config/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/config/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-dbpspotlight.config
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-dbpspotlight.config
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/resources/
- copied from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/resources/
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/resources/README
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/resources/README
incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/src/test/resources/spots.xml
- copied unchanged from r1386535,
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/dbpedia-spotlight/src/test/resources/spots.xml
Modified:
incubator/stanbol/trunk/enhancer/ (props changed)
incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/engines/pom.xml
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
Propchange: incubator/stanbol/trunk/enhancer/
------------------------------------------------------------------------------
Merged /incubator/stanbol/branches/dbpedia-spotlight-engines:r1374978-1386535
Modified: incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml?rev=1386604&r1=1386603&r2=1386604&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml Mon
Sep 17 13:25:11 2012
@@ -197,6 +197,13 @@
<artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
<version>0.10.0-incubating-SNAPSHOT</version>
</bundle>
+
+ <!-- DBpedia Spotlight Engines (STANBOL-706) -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.dbpspotlight</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Default Configuration for the Stanbol Enhancer -->
Propchange: incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 17 13:25:11 2012
@@ -0,0 +1,7 @@
+.classpath
+
+.settings
+
+target
+
+.project
Modified: incubator/stanbol/trunk/enhancer/engines/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/pom.xml?rev=1386604&r1=1386603&r2=1386604&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/pom.xml Mon Sep 17 13:25:11 2012
@@ -56,5 +56,7 @@
<module>geonames</module> <!-- http://geonames.org -->
<module>opencalais</module> <!-- http://opencalais.com/ -->
<module>zemanta</module> <!-- htt://zemanta.com -->
+ <!-- DBpedia.org Spotlight Enhancement Engines (STANBOL-706) -->
+ <module>dbpedia-spotlight</module>
</modules>
</project>
Modified:
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java?rev=1386604&r1=1386603&r2=1386604&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
(original)
+++
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
Mon Sep 17 13:25:11 2012
@@ -420,7 +420,8 @@ public class EnhancementStructureHelper
XSD.dateTime.equals(((TypedLiteral)createdResource).getDataType()));
Date creationDate =
LiteralFactory.getInstance().createObject(Date.class,
(TypedLiteral)createdResource);
assertNotNull("Unable to convert "+createdResource+" to a Java Date
object",creationDate);
- assertTrue("CreationDate MUST NOT be in the Future",new
Date().after(creationDate));
+ Date now = new Date();
+ assertTrue("CreationDate MUST NOT be in the
Future",now.after(creationDate) || now.equals(creationDate));
assertFalse("Only a single createnDate MUST BE present",
createdIterator.hasNext());
//validate optional modification date if present
Iterator<Triple> modDateIterator = enhancements.filter(enhancement,
DCTERMS.modified, null);
