You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/03/25 17:38:18 UTC
svn commit: r1085459 [2/7] - in
/incubator/stanbol/branches/http-endpoint-refactoring: ./
commons/web/src/main/java/org/apache/stanbol/commons/web/ enhancer/
enhancer/SemiAutomaticContentEnhancer/ enhancer/autotagging/
enhancer/clerezza/clerezza-sparql...
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java Fri Mar 25 16:38:08 2011
@@ -78,7 +78,7 @@ public class LocationEnhancementEngine i
public static final Integer defaultOrder = ORDERING_EXTRACTION_ENHANCEMENT;
/**
- * This maps geonames.org feature classes to dbPedia.org ontology classes
+ * This maps geonames.org feature classes to dbpedia.org ontology classes
*/
public static final Map<FeatureClass, Collection<UriRef>> FEATURE_CLASS_CONCEPT_MAPPINGS;
@@ -139,10 +139,10 @@ public class LocationEnhancementEngine i
for (FeatureClass fc : FeatureClass.values()) {
List<UriRef> conceptMappings = new ArrayList<UriRef>();
conceptMappings.add(CONCEPT_GEONAMES_FEATURE); //all things are features
- conceptMappings.add(DBPEDIA_PLACE); //all things are dbPedia places
+ conceptMappings.add(DBPEDIA_PLACE); //all things are dbpedia places
mappings.put(fc, conceptMappings);
}
- //now add additional mappings to the dbPedia Ontology
+ //now add additional mappings to the dbpedia Ontology
UriRef populatedPlace = new UriRef(dbpedia_ont + "PopulatedPlace");
mappings.get(FeatureClass.P).addAll(Arrays.asList(populatedPlace, new UriRef(dbpedia_ont + "Settlement")));
mappings.get(FeatureClass.A).addAll(Arrays.asList(populatedPlace, new UriRef(dbpedia_ont + "AdministrativeRegion")));
@@ -268,7 +268,7 @@ public class LocationEnhancementEngine i
//get all the textAnnotations
/*
* this Map holds the name as key and all the text annotations of
- * dc:type dbPedia:Place that select this name as value
+ * dc:type dbpedia:Place that select this name as value
* this map is used to avoid multiple lookups for text annotations
* selecting the same name.
*/
@@ -294,7 +294,7 @@ public class LocationEnhancementEngine i
placeEnhancements.add(placeEnhancement);
}
} else {
- //TODO: if we also ant to process EntityAnnotations with the dc:type dbPedia:Place
+ //TODO: if we also ant to process EntityAnnotations with the dc:type dbpedia:Place
// than we need to parse the name based on the enhancer:entity-name property
}
}
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/langid/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/langid/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/langid/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/langid/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,7 +23,7 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/metaxa/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/metaxa/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/metaxa/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,7 +23,7 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -140,6 +140,11 @@
<artifactId>icu4j</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -162,7 +167,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</dependency>
-
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opencalais/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opencalais/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opencalais/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opencalais/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,7 +23,7 @@
<parent>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<groupId>org.apache.stanbol</groupId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opennlp-ner/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opennlp-ner/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/opennlp-ner/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/zemanta/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/zemanta/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/zemanta/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/engines/zemanta/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.zemanta</artifactId>
<packaging>bundle</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Enhancer Enhancement Engine : Zemanta Tagging</name>
<description></description>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jobmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jobmanager/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jobmanager/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jobmanager/pom.xml Fri Mar 25 16:38:08 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jsonld/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jsonld/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jsonld/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/jsonld/pom.xml Fri Mar 25 16:38:08 2011
@@ -7,14 +7,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.jsonld</artifactId>
<packaging>bundle</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol JSON-LD API</name>
<description>The FISE JSON-LD API</description>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/servicesapi/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/servicesapi/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/servicesapi/pom.xml Fri Mar 25 16:38:08 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/standalone/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/standalone/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/standalone/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/generic/standalone/pom.xml Fri Mar 25 16:38:08 2011
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/pom.xml Fri Mar 25 16:38:08 2011
@@ -1,17 +1,18 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.integration-tests</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<packaging>jar</packaging>
<name>Apache Stanbol Enhancer Integration Tests</name>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java Fri Mar 25 16:38:08 2011
@@ -90,7 +90,7 @@ public class EnhancerTestBase extends St
.assertStatus(200)
.assertContentType("application/json")
.assertContentRegexp(
- "http:\\\\/\\\\/.*\\\\/entityhub\\\\/site\\\\/dbPedia\\\\/"
+ "http:\\\\/\\\\/.*\\\\/entityhub\\\\/site\\\\/dbpedia\\\\/"
);
log.info("Enhancement engines checked, all present");
return true;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/jersey/pom.xml Fri Mar 25 16:38:08 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/pom.xml Fri Mar 25 16:38:08 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -62,7 +62,7 @@
<jarWebSupport>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.0.4</version>
+ <version>2.2.0</version>
</jarWebSupport>
</configuration>
</execution>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/bundles/list.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/bundles/list.xml Fri Mar 25 16:38:08 2011
@@ -118,6 +118,11 @@
<artifactId>httpcore-osgi</artifactId>
<version>4.0.1</version>
</bundle>
+ <bundle>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </bundle>
<bundle>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -126,7 +131,7 @@
<bundle>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</bundle>
<bundle>
<groupId>joda-time</groupId>
@@ -374,44 +379,44 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.site.linkedData</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <artifactId>org.apache.stanbol.entityhub.site.linkeddata</artifactId>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.clerezza</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="16">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.9-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.ReferencedSiteEntityTaggingEnhancementEngine-dbPedia.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.ReferencedSiteEntityTaggingEnhancementEngine-dbPedia.config?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.ReferencedSiteEntityTaggingEnhancementEngine-dbPedia.config (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.ReferencedSiteEntityTaggingEnhancementEngine-dbPedia.config Fri Mar 25 16:38:08 2011
@@ -1,7 +1,7 @@
org.apache.stanbol.enhancer.engines.entitytagging.nameField="rdfs:label"
org.apache.stanbol.enhancer.engines.entitytagging.personType="dbp-ont:Person"
org.apache.stanbol.enhancer.engines.entitytagging.personState=B"true"
-org.apache.stanbol.enhancer.engines.entitytagging.referencedSiteId="dbPedia"
+org.apache.stanbol.enhancer.engines.entitytagging.referencedSiteId="dbpedia"
org.apache.stanbol.enhancer.engines.entitytagging.placeState=B"true"
org.apache.stanbol.enhancer.engines.entitytagging.organisationState=B"true"
org.apache.stanbol.enhancer.engines.entitytagging.organisationType="dbp-ont:Organisation"
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.core.site.CacheImpl-dbPediaLocalCache.config Fri Mar 25 16:38:08 2011
@@ -1,3 +1,3 @@
-service.pid="org.apache.stanbol.entityhub.core.site.CacheImpl.dbPediaLocalCache"
-org.apache.stanbol.entityhub.yard.cacheYardId="dbPediaCache"
+service.pid="org.apache.stanbol.entityhub.core.site.CacheImpl.dbpediaLocalCache"
+org.apache.stanbol.entityhub.yard.cacheYardId="dbpediaCache"
org.apache.stanbol.entityhub.yard.cache.additionalMappings=["|\ @\=null;en;de;fr;it;es","*"]
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.site.referencedSite-dbPediaSite.config Fri Mar 25 16:38:08 2011
@@ -1,12 +1,12 @@
-service.pid="org.apache.stanbol.entityhub.site.referencedSite.dbPediaSite"
+service.pid="org.apache.stanbol.entityhub.site.referencedSite.dbpediaSite"
org.apache.stanbol.entityhub.site.entityPrefix=["http://dbpedia.org/resource/","http://dbpedia.org/ontology/"]
org.apache.stanbol.entityhub.site.defaultMappedEntityState="proposed"
org.apache.stanbol.entityhub.site.accessUri="http://dbpedia.org/sparql/"
-org.apache.stanbol.entityhub.site.id="dbPedia"
+org.apache.stanbol.entityhub.site.id="dbpedia"
org.apache.stanbol.entityhub.site.fieldMappings=["dbp-ont:*","dbp-ont:thumbnail\ |\ d\=xsd:anyURI\ >\ foaf:depiction","dbp-prop:latitude\ |\ d\=xsd:decimal\ >\ geo:lat","dbp-prop:longitude\ |\ d\=xsd:decimal\ >\ geo:long","dbp-prop:population\ |\ d\=xsd:integer","dbp-prop:website\ |\ d\=xsd:anyURI\ >\ foaf:homepage"]
org.apache.stanbol.entityhub.site.dereferencerType="org.apache.stanbol.entityhub.dereferencer.SparqlDereferencer"
org.apache.stanbol.entityhub.site.cacheStrategy="used"
-org.apache.stanbol.entityhub.site.cacheId="dbPediaCache"
+org.apache.stanbol.entityhub.site.cacheId="dbpediaCache"
org.apache.stanbol.entityhub.site.name="DB\ Pedia"
org.apache.stanbol.entityhub.site.description="The\ OLD\ Endpoint\ for\ Wikipedia"
org.apache.stanbol.entityhub.site.queryUri="http://dbpedia.org/sparql"
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/full/src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-dbPediaLocalCacheYard.config Fri Mar 25 16:38:08 2011
@@ -1,9 +1,9 @@
-service.pid="org.apache.stanbol.entityhub.yard.solr.impl.SolrYard.dbPediaLocalCacheYard"
+service.pid="org.apache.stanbol.entityhub.yard.solr.impl.SolrYard.dbpediaLocalCacheYard"
org.apache.stanbol.entityhub.yard.maxQueryResultNumber=I"-1"
org.apache.stanbol.entityhub.yard.solr.maxBooleanClauses=I"1024"
-org.apache.stanbol.entityhub.yard.description="The\ Cache\ used\ to\ store\ downloaded\ dbPedia\ entities"
+org.apache.stanbol.entityhub.yard.description="The\ Cache\ used\ to\ store\ downloaded\ dbpedia\ entities"
org.apache.stanbol.entityhub.yard.solr.solrUri="cache"
org.apache.stanbol.entityhub.yard.defaultQueryResultNumber=I"-1"
-org.apache.stanbol.entityhub.yard.name="dbPedia\ Cache"
-org.apache.stanbol.entityhub.yard.id="dbPediaCache"
+org.apache.stanbol.entityhub.yard.name="dbpedia\ Cache"
+org.apache.stanbol.entityhub.yard.id="dbpediaCache"
org.apache.stanbol.entityhub.yard.solr.multiYardIndexLayout="true"
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/lite/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/lite/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/lite/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/launchers/lite/pom.xml Fri Mar 25 16:38:08 2011
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -62,7 +62,7 @@
<jarWebSupport>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.0.4</version>
+ <version>2.2.0</version>
</jarWebSupport>
</configuration>
</execution>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/parent/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/parent/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/parent/pom.xml Fri Mar 25 16:38:08 2011
@@ -6,12 +6,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<packaging>pom</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Enhancer Parent POM</name>
<description>Parent POM for Apache Stanbol Enhancer</description>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/pom.xml Fri Mar 25 16:38:08 2011
@@ -16,14 +16,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>./parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.reactor</artifactId>
<packaging>pom</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Enhancer reactor</name>
<description>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/enhancer/stores/jcrstore/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/enhancer/stores/jcrstore/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/enhancer/stores/jcrstore/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/enhancer/stores/jcrstore/pom.xml Fri Mar 25 16:38:08 2011
@@ -4,13 +4,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.stores.jcrstore</artifactId>
<packaging>bundle</packaging>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Enhancer JCR Store</name>
<description>Implementation of the Stanbol Enhancer Store API that uses JCR
</description>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/README.TXT
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/README.TXT?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/README.TXT (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/README.TXT Fri Mar 25 16:38:08 2011
@@ -45,7 +45,7 @@ Configuring Referenced Sites
First configure one or more Referenced Sites by clicking on
Apache Stanbol Entityhub Referenced Site Configuration
-The default values can be used to configure dbPedia.org. Other examples can be
+The default values can be used to configure dbpedia.org. Other examples can be
found in *-siteConfig.txt files (e.g. musicbrainz-siteConfig.txt)
Configuring Yards
@@ -72,7 +72,7 @@ The default values provided by the Yard
suitable for the RickYard. If you need to configure Yard instances for other
purposes you need to change the ID to a different value.
The suggestion is to use the id of the site followed by Yard (e.g. the yard for
-a site with the ID "dbPedia" should be called "dbPediaYard".
+a site with the ID "dbpedia" should be called "dbpediaYard".
Configuring the Apache Stanbol Entityhub
--------------------------------------------
@@ -164,7 +164,7 @@ Description: This service returns a json
Example:
curl "http://localhost:8080/entityhub/sites/referenced"
Response
- ["http:\/\/localhost:8080\/entityhub\/site\/dbPedia\/",
+ ["http:\/\/localhost:8080\/entityhub\/site\/dbpedia\/",
"http:\/\/localhost:8080\/entityhub\/site\/musicbrainz\/"]
@@ -208,7 +208,7 @@ Parameter:
query: the JSON serialized FieldQuery (see section "FieldQuery JSON format"
below)
Example:
- curl -X POST -F "query=@fieldQuery.json" http://localhost:8080/entityhub/site/dbPedia/query
+ curl -X POST -F "query=@fieldQuery.json" http://localhost:8080/entityhub/site/dbpedia/query
Note: that "@fieldQuery.json" links to a local file that contains the parsed
Fieldquery (see ection "FieldQuery JSON format" for examples)
Note: This method suffers form very bad performance on SPARQL Endpoints that do
@@ -233,10 +233,10 @@ endpoint
Request: GET /site/{site}/entity?id={entityID}
Parameter
- site: is the ID configured for the referenced site (e.g. "dbPedia")
+ site: is the ID configured for the referenced site (e.g. "dbpedia")
id: is the URI of the requested Entity
Example
- curl -X GET -H "Accept: application/json" http://localhost:8080/entityhub/site/dbPedia/entity?id=http://dbpedia.org/resource/Paris
+ curl -X GET -H "Accept: application/json" http://localhost:8080/entityhub/site/dbpedia/entity?id=http://dbpedia.org/resource/Paris
/site/{site}/find?name={name}
@@ -245,7 +245,7 @@ Request:
GET /site/{site}/find?name={name}&field={field}&lang={lang}&limit={limit}&offset={offset}
POST -d "name={query}&field={field}&lang={lang}&limit={limit}&offset={offset}" /site/{site}/find
Parameter:
- site: is the ID configured for the referenced site (e.g. "dbPedia")
+ site: is the ID configured for the referenced site (e.g. "dbpedia")
name: the name of the entity (supports wildcards e.g. "Frankf*")
field: the name of the field used for the query. One MUST parse the full
name. Namespace prefixes are not supported yet. (default is rdfs:label)
@@ -256,7 +256,7 @@ Note: This method suffers form very bad
not support extensions for full text searches. On Virtuoso Endpoints do
performance well under normal conditions
Example:
- curl -X POST -d "name=Frankf*&lang=de&limit=10&offset=0" http://localhost:8080/entityhub/site/dbPedia/find
+ curl -X POST -d "name=Frankf*&lang=de&limit=10&offset=0" http://localhost:8080/entityhub/site/dbpedia/find
/site/{site}/query&query={query}
@@ -266,11 +266,11 @@ Allows to parse JSON serialzed FieldQuer
Request:
POST -d "query={query}" /site/{site}/query
Parameter:
- site: is the ID configured for the referenced site (e.g. "dbPedia")
+ site: is the ID configured for the referenced site (e.g. "dbpedia")
query: the JSON serialized FieldQuery (see section "FieldQuery JSON format"
below)
Example:
- curl -X POST -F "query=@fieldQuery.json" http://localhost:8080/entityhub/site/dbPedia/query
+ curl -X POST -F "query=@fieldQuery.json" http://localhost:8080/entityhub/site/dbpedia/query
Note: that "@fieldQuery.json" links to a local file that contains the parsed
Fieldquery (see ection "FieldQuery JSON format" for examples)
Note: This method suffers form very bad performance on SPARQL Endpoints that do
@@ -332,7 +332,7 @@ Example 1: without the create parameter
curl -H "Accept: application/json" "http://localhost:8080/entityhub/symbol/lookup/?id=http://dbpedia.org/resource/Wien"
-This Example looksup the Symbol for the dbPedia Entity "Wien" (The German name
+This Example looksup the Symbol for the dbpedia Entity "Wien" (The German name
for Vienna). If a EntityMapping for this Entity is present in the Apache Stanbol
Entityhub, than this call returns the Symbol. For a example see the Response of
the example of the "/symbol?id={symbolId}" above. A request with the ID of the
@@ -544,7 +544,7 @@ Keys required by all Constraint types:
Reference Constraint keys:
- value: the value (usually an URI) (required)
Example:
-Search for instances of the type Place as defined in the dbPedia ontology
+Search for instances of the type Place as defined in the dbpedia ontology
{
"type": "reference",
"field": "http:\/\/www.w3.org\/1999\/02\/22-rdf-syntax-ns#type",
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Core </name>
<description>The Core Components of the Entityhub. This includes the default
@@ -76,7 +76,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
@@ -86,92 +85,50 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
+ </dependency>
+ <!-- OSGI framework dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- utilities -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>1.6.2</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.3.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.2.4</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>1.0.4</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- <scope>provided</scope>
</dependency>
-
<!-- for tests -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.test</artifactId>
- <version>0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/EntityhubImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/EntityhubImpl.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/EntityhubImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/EntityhubImpl.java Fri Mar 25 16:38:08 2011
@@ -34,6 +34,7 @@ import org.apache.stanbol.entityhub.core
import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory;
import org.apache.stanbol.entityhub.core.model.DefaultEntityMappingImpl;
import org.apache.stanbol.entityhub.core.model.DefaultSymbolImpl;
+import org.apache.stanbol.entityhub.core.query.DefaultQueryFactory;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.core.utils.ModelUtils;
import org.apache.stanbol.entityhub.servicesapi.Entityhub;
@@ -54,12 +55,13 @@ import org.apache.stanbol.entityhub.serv
import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSiteManager;
import org.apache.stanbol.entityhub.servicesapi.yard.Yard;
import org.apache.stanbol.entityhub.servicesapi.yard.YardException;
-import org.apache.stanbol.entityhub.servicesapi.yard.YardManager;
+import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
+import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +70,7 @@ import org.slf4j.LoggerFactory;
* @author Rupert Westenthaler
*
*/
-@Component()
+@Component(immediate=true)
@Service
public final class EntityhubImpl implements Entityhub, ServiceListener {
@@ -77,6 +79,7 @@ public final class EntityhubImpl impleme
/**
* The OSGI component context of the Entityhub
*/
+ @SuppressWarnings("unused")
private ComponentContext context;
/**
* The field mapper holding global mappings that are used for mapping
@@ -85,28 +88,9 @@ public final class EntityhubImpl impleme
private FieldMapper fieldMapper;
/**
- * The yard where this Entityhub instance stores its data
- * TODO: this reference is currently initialised in the activate method.
- * however there are some issues with that.
- * <ul>
- * <li> If this Component is activated, before this yard is active, the
- * activate method throws an Exception and is therefore in the
- * "unsatisfied" state.
- * <li> If now the needed Yard is configured this component gets not notified
- * <li> However defining a Reference is also not possible, because it would
- * be nice to be able to change the Entityhub-Yard (e.g. to change the data
- * set of the Entityhub at runtime)
- * <li> I could register a {@link ServiceListener} in the activate method.
- * But I am not sure if it is allowed to have an active Service Listener
- * on an component that is in the "unsatisfied" state.
- * </ul>
+ * Tracks the availability of the Yard used by the Entityhub.
*/
- private Yard entityhubYard; //reference initialised in the activate method
- /*
- * TODO: The YardManager is currently not used.
- */
- @Reference // 1..1, static
- private YardManager yardManager;
+ private ServiceTracker entityhubYardTracker; //reference initialised in the activate method
/**
* The Configuration of the Entityhub
* TODO: Maybe refactor this implementation to implement this interface or
@@ -129,13 +113,12 @@ public final class EntityhubImpl impleme
* the Entityhub
*/
@Activate
- protected void activate(ComponentContext context) throws ConfigurationException {
- log.info("activating Entityhub ...");
+ protected void activate(final ComponentContext context) throws ConfigurationException {
if(context == null){
throw new IllegalStateException("Unable to activate if parsed ComponentContext is NULL");
- } else {
- this.context = context;
}
+ log.info("activating Entityhub with configuration "+context.getProperties());
+ this.context = context;
//First check the entityhub ID and
log.info(" ... init Basic Properties");
if(config.getID() == null || config.getID().isEmpty()){
@@ -161,26 +144,29 @@ public final class EntityhubImpl impleme
throw new ConfigurationException(EntityhubConfiguration.PREFIX, "The Prefix configured for the Entityhub is not an valied URI (prefix="+config.getEntityhubPrefix()+")");
}
//next get the reference to the configured EntityhubYard
- log.info(" ... init EntityhubYard");
- if(yardManager.isYard(config.getEntityhubYardId())){
- this.entityhubYard = yardManager.getYard(config.getEntityhubYardId());
- String entityhubYardFilterString = '('+Yard.ID+'='+config.getEntityhubYardId()+')';
- try {
- context.getBundleContext().addServiceListener(this,entityhubYardFilterString);
- } catch (InvalidSyntaxException e) {
- log.warn(String.format("Unable to set Filter %s to ServiceListener for EntityhubYard! -> add ServiceListener without Filter",
- entityhubYardFilterString),e);
- context.getBundleContext().addServiceListener(this);
- }
- } else {
- throw new ConfigurationException(EntityhubConfiguration.ENTITYHUB_YARD_ID, "Unable to get Yard for parsed value "+config.getEntityhubYardId());
+ if(config.getEntityhubPrefix() == null){
+ throw new ConfigurationException(EntityhubConfiguration.ENTITYHUB_YARD_ID, "The ID of the Yard used by the Entityhub MUST NOT be NULL");
}
+ if(config.getEntityhubYardId().isEmpty()){
+ throw new ConfigurationException(EntityhubConfiguration.ENTITYHUB_YARD_ID, "The ID of the Yard used by the Entityhub MUST NOT be empty");
+ }
+ String entityhubYardFilterString = String.format("(&(%s=%s)(%s=%s))",
+ Constants.OBJECTCLASS,Yard.class.getName(),
+ Yard.ID,config.getEntityhubYardId());
+ log.info(" ... tracking EntityhubYard by Filter:"+entityhubYardFilterString);
+ try {
+ entityhubYardTracker = new ServiceTracker(context.getBundleContext(),
+ context.getBundleContext().createFilter(entityhubYardFilterString), null);
+ } catch (InvalidSyntaxException e) {
+ throw new IllegalStateException("Got Invalid Syntax Exception for Entityhub filter ",e);
+ }
+ entityhubYardTracker.open(); //start the tracking
//at last get the FieldMappingConfig and create the FieldMappings instance
// -> we need to do that after the init of the Entityhub-yard, because than we
// can use the valueFactory of the configured Yard to create instances
// of converted values!
log.info(" ... init FieldMappings");
- fieldMapper = new DefaultFieldMapperImpl(ValueConverterFactory.getInstance(entityhubYard.getValueFactory()));
+ fieldMapper = new DefaultFieldMapperImpl(ValueConverterFactory.getDefaultInstance());
for(String mappingString : config.getFieldMappingConfig()){
FieldMapping mapping = FieldMappingUtils.parseFieldMapping(mappingString);
if(mapping != null){
@@ -203,13 +189,12 @@ public final class EntityhubImpl impleme
@Deactivate
protected void deactivate(ComponentContext context) {
- log.info("!!deactivate");
- if(this.entityhubYard != null){
- //unregister the serviceListener
- this.context.getBundleContext().removeServiceListener(this);
- }
+ log.info("deactivate "+EntityhubImpl.class);
this.fieldMapper = null;
- this.entityhubYard = null;
+ if(entityhubYardTracker != null){
+ this.entityhubYardTracker.close();
+ this.entityhubYardTracker = null;
+ }
this.context = null;
}
@@ -219,7 +204,20 @@ public final class EntityhubImpl impleme
// }
@Override
public Yard getYard() {
- return entityhubYard;
+ return (Yard)entityhubYardTracker.getService();
+ }
+ /**
+ * Internally used to lookup the yard. This throws an {@link YardException}
+ * in case the yard is currently not available
+ * @return the yard
+ * @throws YardException in case the yard is not active
+ */
+ private Yard lookupYard() throws YardException {
+ Yard yard = getYard();
+ if(yard == null){
+ throw new YardException("The Entityhub Yard (ID="+config.getEntityhubYardId()+") is not active! Please check the configuration!!");
+ }
+ return yard;
}
@Override
@@ -302,7 +300,7 @@ public final class EntityhubImpl impleme
if(symbolId == null || symbolId.isEmpty()){
throw new IllegalArgumentException("The parsed symbolID MUST NOT be NULL nor empty!");
}
- Representation rep = entityhubYard.getRepresentation(symbolId);
+ Representation rep = lookupYard().getRepresentation(symbolId);
if(rep != null){
try {
return new DefaultSymbolImpl(config.getEntityhubPrefix(),rep);
@@ -327,6 +325,7 @@ public final class EntityhubImpl impleme
log.warn("Unable to create Symbol because the ReferencedSite "+sign.getSignSite()+" for sign "+sign.getId()+" is currently not active -> return null");
return null;
}
+ Yard entityhubYard = lookupYard();
Representation symbolRep = entityhubYard.create(constructResourceId(DEFAULT_SYMBOL_PREFIX));
//and set the initial state
symbolRep.addReference(Symbol.STATE, config.getDefaultSymbolState().getUri());
@@ -340,7 +339,7 @@ public final class EntityhubImpl impleme
Representation signRep = sign.getRepresentation();
//TODO: As soon as MappingActivities are implemented we need to add such
// information to the EntityMapping instance!
- mapper.applyMappings(signRep, symbolRep);
+ mapper.applyMappings(signRep, symbolRep,entityhubYard.getValueFactory());
//Second create the symbol and init the data
Symbol symbol;
try {
@@ -417,7 +416,7 @@ public final class EntityhubImpl impleme
}
FieldQuery fieldQuery = getQueryFavtory().createFieldQuery();
fieldQuery.setConstraint(RdfResourceEnum.mappedEntity.getUri(), new ReferenceConstraint(reference));
- QueryResultList<String> resultList = entityhubYard.findReferences(fieldQuery);
+ QueryResultList<String> resultList = lookupYard().findReferences(fieldQuery);
if(!resultList.isEmpty()){
Iterator<String> resultIterator = resultList.iterator();
EntityMapping entityMapping = getEntityMappingFromYard(resultIterator.next());
@@ -442,7 +441,7 @@ public final class EntityhubImpl impleme
}
FieldQuery fieldQuery = getQueryFavtory().createFieldQuery();
fieldQuery.setConstraint(RdfResourceEnum.mappedSymbol.getUri(), new ReferenceConstraint(symbol));
- QueryResultList<String> resultList = entityhubYard.findReferences(fieldQuery);
+ QueryResultList<String> resultList = lookupYard().findReferences(fieldQuery);
Collection<EntityMapping> mappings = new HashSet<EntityMapping>();
for(String mappingId : resultList){
EntityMapping entityMapping = getEntityMappingFromYard(mappingId);
@@ -463,7 +462,7 @@ public final class EntityhubImpl impleme
* is not an valid {@link EntityMapping}.
*/
protected EntityMapping getEntityMappingFromYard(String id) throws IllegalArgumentException,YardException {
- Representation rep = entityhubYard.getRepresentation(id);
+ Representation rep = lookupYard().getRepresentation(id);
if(rep != null){
return new DefaultEntityMappingImpl(config.getEntityhubPrefix(),rep);
} else {
@@ -477,7 +476,10 @@ public final class EntityhubImpl impleme
}
@Override
public FieldQueryFactory getQueryFavtory() {
- return entityhubYard.getQueryFactory();
+ Yard entityhubYard = getYard();
+ return entityhubYard==null? //if no yard available
+ DefaultQueryFactory.getInstance(): //use the default
+ entityhubYard.getQueryFactory(); //else return the query factory used by the yard
}
@Override
public FieldMapper getFieldMappings() {
@@ -485,22 +487,22 @@ public final class EntityhubImpl impleme
}
@Override
public QueryResultList<Representation> find(FieldQuery query) throws YardException{
- return entityhubYard.find(query);
+ return lookupYard().find(query);
}
@Override
public QueryResultList<String> findSymbolReferences(FieldQuery query) throws YardException{
- return entityhubYard.findReferences(query);
+ return lookupYard().findReferences(query);
}
@Override
public QueryResultList<Symbol> findSymbols(FieldQuery query) throws YardException{
- QueryResultList<String> references = entityhubYard.findReferences(query);
+ QueryResultList<String> references = lookupYard().findReferences(query);
List<Symbol> symbols = new ArrayList<Symbol>(references.size());
for(String reference : references){
Symbol symbol = lookupSymbol(reference);
if(symbol != null){
symbols.add(symbol);
} else {
- log.warn("Unable to create Symbol for Reference "+reference+" in the Yard usd by the entity hub [id="+entityhubYard.getId()+"] -> ignore reference");
+ log.warn("Unable to create Symbol for Reference "+reference+" in the Yard usd by the entity hub [id="+config.getEntityhubYardId()+"] -> ignore reference");
}
}
return new QueryResultListImpl<Symbol>(references.getQuery(), symbols, Symbol.class);
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferenceManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferenceManagerImpl.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferenceManagerImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferenceManagerImpl.java Fri Mar 25 16:38:08 2011
@@ -163,15 +163,14 @@ public class ReferenceManagerImpl implem
Collection<ReferencedSite> sites = prefixMap.get(prefix);
if(sites != null){
sites.remove(referencedSite);
- }
- if(sites.isEmpty()){
- //remove key from the Map
- prefixMap.remove(prefix);
- //remove also the prefix from the List
- prefixList.remove(prefix);
+ if(sites.isEmpty()){
+ //remove key from the Map
+ prefixMap.remove(prefix);
+ //remove also the prefix from the List
+ prefixList.remove(prefix);
+ }
}
}
-
}
}
@Override
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteImpl.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/impl/ReferencedSiteImpl.java Fri Mar 25 16:38:08 2011
@@ -136,7 +136,7 @@ import org.slf4j.LoggerFactory;
)
@Service(value=ReferencedSite.class)
@Properties(value={
- @Property(name=ConfiguredSite.ID,value="dbPedia"),
+ @Property(name=ConfiguredSite.ID,value="dbpedia"),
@Property(name=ConfiguredSite.NAME,value="DB Pedia"),
@Property(name=ConfiguredSite.DESCRIPTION, value="The OLD Endpoint for Wikipedia"),
/*
@@ -708,7 +708,7 @@ public class ReferencedSiteImpl implemen
*/
private void initFieldmappings(final ComponentContext context) throws ConfigurationException, InvalidSyntaxException {
//create the FieldMappings config
- fieldMappings = new DefaultFieldMapperImpl(ValueConverterFactory.getInstance());
+ fieldMappings = new DefaultFieldMapperImpl(ValueConverterFactory.getDefaultInstance());
Object configuredMappingsObject = properties.get(ConfiguredSite.SITE_FIELD_MAPPINGS);
log.info(" > Parse FieldMappungs");
if(configuredMappingsObject != null){
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/DefaultFieldMapperImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/DefaultFieldMapperImpl.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/DefaultFieldMapperImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/DefaultFieldMapperImpl.java Fri Mar 25 16:38:08 2011
@@ -34,6 +34,7 @@ import org.apache.stanbol.entityhub.serv
import org.apache.stanbol.entityhub.servicesapi.mapping.FieldMapping;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.model.Text;
+import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
import org.apache.stanbol.entityhub.servicesapi.query.TextConstraint;
import org.apache.stanbol.entityhub.servicesapi.query.ValueConstraint;
import org.apache.stanbol.entityhub.servicesapi.query.Constraint.ConstraintType;
@@ -201,7 +202,7 @@ public class DefaultFieldMapperImpl impl
/* (non-Javadoc)
* @see org.apache.stanbol.entityhub.servicesapi.mapping.FieldMapper#applyMappings(org.apache.stanbol.entityhub.servicesapi.model.Representation, org.apache.stanbol.entityhub.servicesapi.model.Representation)
*/
- public Representation applyMappings(Representation source, Representation target) {
+ public Representation applyMappings(Representation source, Representation target, ValueFactory valueFactory) {
Collection<String> fields = new HashSet<String>();
for(Iterator<String> fieldIt = source.getFieldNames();fieldIt.hasNext();){
fields.add(fieldIt.next());
@@ -268,7 +269,7 @@ public class DefaultFieldMapperImpl impl
for(FieldMapping mapping : activeMappings){
if(!mapping.ignoreField() &&
!Collections.disjoint(targetFields, mapping.getMappings())){
- processMapping(mapping, field, values,globalFiltered, targetFields, target);
+ processMapping(mapping, valueFactory, field, values,globalFiltered, targetFields, target);
// } else if(!mapping.ignoreField()) {
// log.info(String.format(" << ignore mapping %s ",mapping));
// } else {
@@ -287,12 +288,13 @@ public class DefaultFieldMapperImpl impl
/**
*
* @param mapping
+ * @param valueFactory The value factory used to create converted values
* @param field
* @param values
* @param globalFiltered
* @param targets
*/
- private void processMapping(FieldMapping mapping, String field, Collection<Object> values, Collection<Object> globalFiltered, Set<String> activeTargets,Representation targetRepresentation) {
+ private void processMapping(FieldMapping mapping, ValueFactory valueFactory,String field, Collection<Object> values, Collection<Object> globalFiltered, Set<String> activeTargets,Representation targetRepresentation) {
//parsed mappings are all !ignore and some mappings are active
Collection<Object> filtered; //this collection will be modified by the filters later on
if(globalFiltered == null || //if no global filter is present and therefore globalFiltered == null or
@@ -306,7 +308,7 @@ public class DefaultFieldMapperImpl impl
switch (mapping.getFilter().getType()) {
case value:
ValueConstraint valueConstraint = (ValueConstraint)mapping.getFilter();
- processFilter(valueConstraint,filtered);
+ processFilter(valueConstraint,filtered,valueFactory);
break;
case text:
TextConstraint textConstraint = (TextConstraint)mapping.getFilter();
@@ -394,7 +396,7 @@ public class DefaultFieldMapperImpl impl
* @param values
* @return
*/
- private Collection<Object> processFilter(ValueConstraint valueConstraint, Collection<Object> values) {
+ private Collection<Object> processFilter(ValueConstraint valueConstraint, Collection<Object> values,ValueFactory valueFactory) {
if(valueConstraint.getValue() != null){
log.warn("Filtering based on values is not yet implemented");
}
@@ -457,7 +459,7 @@ public class DefaultFieldMapperImpl impl
for(Iterator<DataTypeEnum> dataTypes = sortedActiveDataTypes.iterator(); //iterate over all active dataTypes
converted == null && dataTypes.hasNext();){ //while converted still null and more dataTypes to try
convertedTo = dataTypes.next();
- converted = valueConverter.convert(value, convertedTo.getUri()); //try the conversion
+ converted = valueConverter.convert(value, convertedTo.getUri(),valueFactory); //try the conversion
}
if(converted != null){
// log.info(String.format(" + value %s(javaType=%s) successfully converted to %s(datatype=%s)",
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/ValueConverterFactory.java Fri Mar 25 16:38:08 2011
@@ -55,44 +55,21 @@ import org.apache.stanbol.entityhub.serv
*
*/
public class ValueConverterFactory {
+
+ private static ValueConverterFactory defaultInstance;
/**
- * Map with the instances. Weak references are used for both keys and values.
- */
- @SuppressWarnings("unchecked")
- private static Map<ValueFactory,ValueConverterFactory> instances = Collections.synchronizedMap(
- new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK, true));
- /**
- * Getter for the ValueConverterFactory instance using the default {@link ValueFactory}
+ * Getter for the ValueConverterFactory instance using the default configurations
+ * of converters. This configuration can not be changed.<p>
+ * If you need to use a specific configuration use the public constructor
+ * to create your own private instance!
* @return the default ValueConverterFactory instance
*/
- public static ValueConverterFactory getInstance(){
- return getInstance(null);
- }
- /**
- * Getter for the ValueConverterFactory instance using a specific
- * {@link ValueFactory}.
- * @param valueFactory the valueFatory
- * @return the ValueConverterFactory for the parsed {@link ValueFactory}.
- */
- public static ValueConverterFactory getInstance(ValueFactory valueFactory){
- if(valueFactory == null){
- valueFactory = InMemoryValueFactory.getInstance();
- }
- synchronized (instances) {
- ValueConverterFactory converter = instances.get(valueFactory);
- if(converter == null){
- //create read only instance!
- converter = new ValueConverterFactory(valueFactory,true);
- instances.put(valueFactory, converter);
- }
- return converter;
+ public static ValueConverterFactory getDefaultInstance(){
+ if(defaultInstance == null){
+ defaultInstance = new ValueConverterFactory(true);
}
+ return defaultInstance;
}
- /**
- * The {@link ValueFactory} used by converters to create instances for converted
- * values.
- */
- private final ValueFactory valueFactory;
private boolean readonly = false;
/**
* Creates a new factory instance that supports conversions for all
@@ -104,20 +81,15 @@ public class ValueConverterFactory {
* create {@link Text} and {@link Reference} instances. If <code>null</code>
* the {@link InMemoryValueFactory} is used.
*/
- public ValueConverterFactory(ValueFactory valueFactory){
- this(valueFactory,false);
+ public ValueConverterFactory(){
+ this(false);
}
/**
* Internally used to ensure readonly state for instances created by the
* static {@link #getInstance(ValueFactory)} methods.
* @see #ValueConverterFactory(ValueFactory)
*/
- private ValueConverterFactory(ValueFactory valueFactory,boolean readonly){
- if(valueFactory == null){
- this.valueFactory = InMemoryValueFactory.getInstance();
- } else {
- this.valueFactory = valueFactory;
- }
+ private ValueConverterFactory(boolean readonly){
init();
this.readonly = readonly;
}
@@ -183,12 +155,12 @@ public class ValueConverterFactory {
* possible.
* @throws IllegalArgumentException if the parsed dataTyeUri is <code>null</code>
*/
- public Object convert(Object value,String dataTypeUri) throws IllegalArgumentException {
+ public Object convert(Object value,String dataTypeUri,ValueFactory valueFactory) throws IllegalArgumentException {
if(dataTypeUri == null){
throw new IllegalArgumentException("The parsed datatype URI MUST NOT be NULL!");
}
ValueConverter<?> converter = uri2converter.get(dataTypeUri);
- return converter != null?converter.convert(value):null;
+ return converter != null?converter.convert(value,valueFactory):null;
}
@@ -220,15 +192,16 @@ public class ValueConverterFactory {
* converter and may be supported for some datatypes. If not supported,
* than parsing <code>null</code> results in <code>null</code> to be
* returned.
+ * @param valueFactory the ValueFactory used to create the converted value
* @return the converted value or <code>null</code> if the conversion was not
* possible
*/
- T convert(Object value);
+ T convert(Object value,ValueFactory valueFactory);
}
public class BooleanConverter implements ValueConverter<Boolean>{
@Override
- public Boolean convert(Object value) {
+ public Boolean convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -249,7 +222,7 @@ public class ValueConverterFactory {
}
public class ByteConverter implements ValueConverter<Byte>{
@Override
- public Byte convert(Object value) {
+ public Byte convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -267,7 +240,7 @@ public class ValueConverterFactory {
}
public class ShortConverter implements ValueConverter<Short>{
@Override
- public Short convert(Object value) {
+ public Short convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -285,7 +258,7 @@ public class ValueConverterFactory {
}
public class IntConverter implements ValueConverter<Integer>{
@Override
- public Integer convert(Object value) {
+ public Integer convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -303,7 +276,7 @@ public class ValueConverterFactory {
}
public class LongConverter implements ValueConverter<Long>{
@Override
- public Long convert(Object value) {
+ public Long convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -320,7 +293,7 @@ public class ValueConverterFactory {
}
public class FloatConverter implements ValueConverter<Float>{
@Override
- public Float convert(Object value) {
+ public Float convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -337,7 +310,7 @@ public class ValueConverterFactory {
}
public class DoubleConverter implements ValueConverter<Double>{
@Override
- public Double convert(Object value) {
+ public Double convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -354,7 +327,7 @@ public class ValueConverterFactory {
}
public class IntegerConverter implements ValueConverter<BigInteger>{
@Override
- public BigInteger convert(Object value) {
+ public BigInteger convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -371,7 +344,7 @@ public class ValueConverterFactory {
}
public class DecimalConverter implements ValueConverter<BigDecimal>{
@Override
- public BigDecimal convert(Object value) {
+ public BigDecimal convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -388,7 +361,7 @@ public class ValueConverterFactory {
}
public class AnyUriConverter implements ValueConverter<Reference>{
@Override
- public Reference convert(Object value) {
+ public Reference convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -423,7 +396,7 @@ public class ValueConverterFactory {
this.dataType = dataType;
}
@Override
- public Date convert(Object value) {
+ public Date convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -454,7 +427,7 @@ public class ValueConverterFactory {
}
public class TextConverter implements ValueConverter<Text> {
@Override
- public Text convert(Object value) {
+ public Text convert(Object value, ValueFactory valueFactory) {
if (value == null) {
return null;
}
@@ -469,7 +442,7 @@ public class ValueConverterFactory {
}
public class StringConverter implements ValueConverter<String> {
@Override
- public String convert(Object value) { return value.toString(); }
+ public String convert(Object value, ValueFactory valueFactory) { return value.toString(); }
@Override
public String getDataType() { return DataTypeEnum.String.getUri(); }
}
@@ -490,7 +463,7 @@ public class ValueConverterFactory {
this.nullAsZeroLengthDuration = nullAsZeroLengthDuration;
}
@Override
- public Duration convert(Object value) {
+ public Duration convert(Object value, ValueFactory valueFactory) {
if(value == null){
if(nullAsZeroLengthDuration){
return TimeUtils.toDuration(null,true);
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheImpl.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheImpl.java Fri Mar 25 16:38:08 2011
@@ -117,7 +117,7 @@ public class CacheImpl implements Cache
Object mappings = context.getProperties().get(Cache.ADDITIONAL_MAPPINGS);
FieldMapper configuredMappings = null;
if (mappings instanceof String[] && ((String[]) mappings).length > 0) {
- configuredMappings = new DefaultFieldMapperImpl(ValueConverterFactory.getInstance(yard.getValueFactory()));
+ configuredMappings = new DefaultFieldMapperImpl(ValueConverterFactory.getDefaultInstance());
for (String mappingString : (String[]) mappings) {
FieldMapping fieldMapping = FieldMappingUtils.parseFieldMapping(mappingString);
if (fieldMapping != null) {
@@ -253,16 +253,16 @@ public class CacheImpl implements Cache
private Representation applyCacheMappings(Yard yard, Representation representation) {
long start = System.currentTimeMillis();
Representation mapped = null;
- ;
+ ValueFactory valueFactory = getValueFactory();
if (baseMapper != null) {
mapped = yard.getValueFactory().createRepresentation(representation.getId());
- baseMapper.applyMappings(representation, mapped);
+ baseMapper.applyMappings(representation, mapped,valueFactory);
}
if (additionalMapper != null) {
if (mapped == null) {
mapped = yard.getValueFactory().createRepresentation(representation.getId());
}
- additionalMapper.applyMappings(representation, mapped);
+ additionalMapper.applyMappings(representation, mapped,valueFactory);
}
log.info(" -- applied mappings in " + (System.currentTimeMillis() - start) + "ms");
return mapped != null ? mapped : representation;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheUtils.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheUtils.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/site/CacheUtils.java Fri Mar 25 16:38:08 2011
@@ -106,7 +106,7 @@ public final class CacheUtils {
private static FieldMapper readFieldConfig(Yard yard,Representation config) {
Object mappingValue = config.getFirst(Cache.FIELD_MAPPING_CONFIG_FIELD);
if(mappingValue != null){
- DefaultFieldMapperImpl fieldMapper = new DefaultFieldMapperImpl(ValueConverterFactory.getInstance(yard.getValueFactory()));
+ DefaultFieldMapperImpl fieldMapper = new DefaultFieldMapperImpl(ValueConverterFactory.getDefaultInstance());
for(String mappingStirng : mappingValue.toString().split("\n")){
FieldMapping mapping = FieldMappingUtils.parseFieldMapping(mappingStirng);
if(mapping != null){
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/yard/AbstractYard.java Fri Mar 25 16:38:08 2011
@@ -300,7 +300,7 @@ public abstract class AbstractYard imple
}
/**
* Setter for the ID of the yard. The id is usually a sort name such as
- * "dbPedia", "freebase", "geonames.org", "my.projects" ...<p>
+ * "dbpedia", "freebase", "geonames.org", "my.projects" ...<p>
* If {@link #isMultiYardIndexLayout()} than this ID is used to identify
* Representations of this Yard within the SolrIndex.
* @param the id of the yard. Required, not null, not empty!
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
<packaging>bundle</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub Services API</name>
<description>The Services API of the Entityhub</description>
@@ -74,35 +74,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.4.4</version>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- <dependency> no longer needed!
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency> -->
- <!-- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency> -->
-
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/mapping/FieldMapper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/mapping/FieldMapper.java?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/mapping/FieldMapper.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/servicesapi/src/main/java/org/apache/stanbol/entityhub/servicesapi/mapping/FieldMapper.java Fri Mar 25 16:38:08 2011
@@ -20,6 +20,7 @@ import java.util.Collection;
import org.apache.stanbol.entityhub.servicesapi.model.EntityMapping;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
+import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
public interface FieldMapper extends Cloneable{
@@ -46,12 +47,13 @@ public interface FieldMapper extends Clo
* are NOT used as source fields for further mappings.
* @param source the source for the mapping process
* @param target the target for the processed mappings (can be the same as source)
+ * @param valueFactory The valueFactory used to create values while applying the mappings
* @return the {@link Representation} parsed as target.
* TODO: This Method should return a MappingReport, that can be stored with
* the {@link EntityMapping}. However the MappingActivity functionality is
* not yet designed/implemented!
*/
- Representation applyMappings(Representation source, Representation target);
+ Representation applyMappings(Representation source, Representation target,ValueFactory valueFactory);
/**
* Getter for the unmodifiable collection of all mappings
* @return the configured mappings
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/test/pom.xml?rev=1085459&r1=1085458&r2=1085459&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/test/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/generic/test/pom.xml Fri Mar 25 16:38:08 2011
@@ -23,14 +23,14 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.test</artifactId>
<packaging>jar</packaging>
- <version>0.1-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<name>Apache Stanbol Entityhub - Test Framework</name>
<description>Unit test framework for the Interfaces defined within the
services APO of the Entityhub</description>
@@ -53,7 +53,6 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
- <version>0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>