You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/04/08 17:12:46 UTC
svn commit: r1311019 [1/5] - in /incubator/stanbol/trunk: ./
contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/
contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/
contenthub/store/...
Author: rwesten
Date: Sun Apr 8 15:12:40 2012
New Revision: 1311019
URL: http://svn.apache.org/viewvc?rev=1311019&view=rev
Log:
Implementation for the following Issues:
STANBOL-573 (and sub-tasks STANBOL-579, STANBOL-577): Implementation of the ContentItemFactory and refactoring all components to use the new factory
STANBOL-575: added an enhancer test module
STANBOL-576: refactored the servicesapi module
* moved all implementation of the servicesapi module form .helper to .impl
* moved rdfentities to an own module (this was only used by some unit tests)
* moved in-memory ContentItem/Blob implementation to the new enhancer.core module
* also moved the EnhancementEngineManager and ChainManager implementations from their own module to the new enhancer.core
STANBOL-574: added implementation of an File based ContentItem/Blob
STANBOL-562: Changed the default home directory for the Stanbol launchers (framework, stable, full, full-war) from /sling to /stanbol.
* also added a common.properties file that defines a stanbol.home property set to "${sling.home}"
* Note that the common.properties file can be used to define any additional environment property. However it CAN NOT override properties already defined by the sling.properties file.
Note: this does not yet fix all that issues as some minor things like (metatype.properties, adding apache headers to files, license information for dependencies ...) are still missing.
Added:
incubator/stanbol/trunk/enhancer/generic/core/ (with props)
incubator/stanbol/trunk/enhancer/generic/core/pom.xml (with props)
incubator/stanbol/trunk/enhancer/generic/core/src/
incubator/stanbol/trunk/enhancer/generic/core/src/main/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/chainmanager/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/chainmanager/impl/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/chainmanager/impl/ChainManagerImpl.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/file/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/file/FileContentItemFactory.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/inmemory/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/inmemory/InMemoryBlob.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/inmemory/InMemoryContentItem.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/contentitem/inmemory/InMemoryContentItemFactory.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/enginemanager/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/enginemanager/impl/
incubator/stanbol/trunk/enhancer/generic/core/src/main/java/org/apache/stanbol/enhancer/enginemanager/impl/EnhancementEngineManagerImpl.java
incubator/stanbol/trunk/enhancer/generic/core/src/main/resources/
incubator/stanbol/trunk/enhancer/generic/core/src/main/resources/OSGI-INF/
incubator/stanbol/trunk/enhancer/generic/core/src/main/resources/OSGI-INF/metatype/
incubator/stanbol/trunk/enhancer/generic/core/src/test/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/file/
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/file/CustomDirFileContentItemFactoryTest.java
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/file/DefaultFileContentItemFactoryTest.java
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/file/FileBlobTest.java
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/file/FileContentItemTest.java
incubator/stanbol/trunk/enhancer/generic/core/src/test/java/org/apache/stanbol/enhancer/contentitem/inmemory/
incubator/stanbol/trunk/enhancer/generic/rdfentities/ (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/pom.xml (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/fise/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/fise/Enhancement.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/fise/EntityAnnotation.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/fise/TextAnnotation.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/RdfProxyInvocationHandler.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/main/java/org/apache/stanbol/enhancer/rdfentities/impl/SimpleRdfEntityFactory.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/RdfEntityFactoryTest.java (with props)
incubator/stanbol/trunk/enhancer/generic/rdfentities/src/test/java/org/apache/stanbol/enhancer/rdfentities/fise/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentItemFactory.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentReference.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentSink.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/ContentSource.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/package.html (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/impl/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/package.html (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/EnhancementEngineHelperTest.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentReferenceTest.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/impl/ContentSourceTest.java (with props)
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/resources/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/resources/contentReferece_test.txt (with props)
incubator/stanbol/trunk/enhancer/generic/test/ (with props)
incubator/stanbol/trunk/enhancer/generic/test/pom.xml (with props)
incubator/stanbol/trunk/enhancer/generic/test/src/
incubator/stanbol/trunk/enhancer/generic/test/src/main/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/
incubator/stanbol/trunk/launchers/framework/src/main/sling/
incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties (with props)
incubator/stanbol/trunk/launchers/full/src/main/sling/
incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties (with props)
incubator/stanbol/trunk/launchers/stable/src/main/sling/
incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties (with props)
Removed:
incubator/stanbol/trunk/enhancer/generic/chainmanager/
incubator/stanbol/trunk/enhancer/generic/enginemanager/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/Enhancement.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/EntityAnnotation.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/SparqlQueryEngine.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/TextAnnotation.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/AbstractChain.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/AbstractEnhancementEngine.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ChainsTracker.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemImpl.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/EnginesTracker.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryBlob.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/NameBasedServiceTrackingState.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/Rdf.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntity.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/RdfEntityFactory.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ServiceReferenceRankingComparator.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/impl/
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/AbstractBlobTest.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/ContentItemTest.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/InMemoryBlobTest.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/RdfEntityFactoryTest.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/test/java/org/apache/stanbol/enhancer/serviceapi/helper/TestEnhancementInterfaces.java
Modified:
incubator/stanbol/trunk/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaContentItem.java
incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaStore.java
incubator/stanbol/trunk/contenthub/store/inmemory/pom.xml
incubator/stanbol/trunk/contenthub/store/inmemory/src/main/java/org/apache/stanbol/contenthub/store/inmemory/InMemoryStore.java
incubator/stanbol/trunk/contenthub/store/solr/pom.xml
incubator/stanbol/trunk/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrContentItemImpl.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/Benchmark.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkImpl.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
incubator/stanbol/trunk/enhancer/benchmark/src/main/resources/velocity/benchmark-results.html
incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/AllActiveEnginesChain.java
incubator/stanbol/trunk/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
incubator/stanbol/trunk/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java
incubator/stanbol/trunk/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml
incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/TestTaxonomyLinker.java
incubator/stanbol/trunk/enhancer/engines/langid/src/main/java/org/apache/stanbol/enhancer/engines/langid/LangIdEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml
incubator/stanbol/trunk/enhancer/engines/metaxa/src/main/java/org/apache/stanbol/enhancer/engines/metaxa/MetaxaEngine.java
incubator/stanbol/trunk/enhancer/engines/opencalais/pom.xml
incubator/stanbol/trunk/enhancer/engines/opencalais/src/main/java/org/apache/stanbol/enhancer/engines/opencalais/impl/OpenCalaisEngine.java
incubator/stanbol/trunk/enhancer/engines/opencalais/src/test/java/org/apache/stanbol/enhancer/engines/opencalais/impl/TestOpenCalaisEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/tika/pom.xml
incubator/stanbol/trunk/enhancer/engines/tika/src/main/java/org/apache/stanbol/enhancer/engines/tika/TikaEngine.java
incubator/stanbol/trunk/enhancer/engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/TikaEngineTest.java
incubator/stanbol/trunk/enhancer/engines/zemanta/pom.xml
incubator/stanbol/trunk/enhancer/engines/zemanta/src/main/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/zemanta/src/test/java/org/apache/stanbol/enhancer/engines/zemanta/impl/ZemantaEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/Blob.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ContentItemHelper.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/rdf/Enhancer.java
incubator/stanbol/trunk/enhancer/jersey/pom.xml
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/reader/ContentItemReader.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerResource.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
incubator/stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
incubator/stanbol/trunk/enhancer/ldpath/pom.xml
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/ContentItemFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/PathFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/main/java/org/apache/stanbol/enhancer/ldpath/function/SuggestionFunction.java
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/ContentItemBackendTest.java
incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java
incubator/stanbol/trunk/enhancer/pom.xml
incubator/stanbol/trunk/launchers/framework/pom.xml
incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml
incubator/stanbol/trunk/launchers/full/pom.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stable/pom.xml
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
Modified: incubator/stanbol/trunk/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java (original)
+++ incubator/stanbol/trunk/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java Sun Apr 8 15:12:40 2012
@@ -46,7 +46,6 @@ import org.apache.solr.common.util.Named
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
import org.apache.stanbol.contenthub.search.featured.util.SolrContentItemConverter;
import org.apache.stanbol.contenthub.search.solr.util.SolrQueryUtil;
-import org.apache.stanbol.contenthub.servicesapi.Constants;
import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
import org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
@@ -58,9 +57,10 @@ import org.apache.stanbol.contenthub.ser
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.store.solr.manager.SolrCoreManager;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.EnhancementException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
+import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
@@ -110,6 +110,9 @@ public class FeaturedSearchImpl implemen
@Reference
private EnhancementJobManager enhancementJobManager;
+ @Reference
+ private ContentItemFactory ciFactory;
+
private BundleContext bundleContext;
@Activate
@@ -240,7 +243,7 @@ public class FeaturedSearchImpl implemen
ContentItem ci = null;
boolean error = false;
try {
- ci = new InMemoryContentItem(queryTerm.getBytes(Constants.DEFAULT_ENCODING), "text/plain");
+ ci = ciFactory.createContentItem(new StringSource(queryTerm));
enhancementJobManager.enhanceContent(ci);
} catch (UnsupportedEncodingException e) {
log.error("Failed to get bytes of query term: {}", queryTerm, e);
@@ -248,6 +251,10 @@ public class FeaturedSearchImpl implemen
} catch (EnhancementException e) {
log.error("Failed to get enmancements for the query term: {}", queryTerm, e);
error = true;
+ } catch (IOException e) {
+ log.error("Failed to create a ContentItem by using "
+ + ciFactory.getClass().getSimpleName()+"!",e);
+ error = true;
}
List<String> tokenizedTerms = new ArrayList<String>();
Modified: incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java (original)
+++ incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java Sun Apr 8 15:12:40 2012
@@ -19,7 +19,6 @@ package org.apache.stanbol.contenthub.se
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.NotImplementedException;
import org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
@@ -62,14 +61,14 @@ public class RelatedKeywordSearchResult
public void setDocuments(List<DocumentResult> resultantDocuments) {
String msg = "RelatedKeywordSearchResult cannot contain any ResultantDocument";
log.error(msg);
- throw new NotImplementedException(msg);
+ throw new UnsupportedOperationException(msg);
}
@Override
public void setFacets(List<FacetResult> facets) {
String msg = "RelatedKeywordSearchResult cannot contain any FacetField";
log.error(msg);
- throw new NotImplementedException(msg);
+ throw new UnsupportedOperationException(msg);
}
@Override
Modified: incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaContentItem.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaContentItem.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaContentItem.java (original)
+++ incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaContentItem.java Sun Apr 8 15:12:40 2012
@@ -20,7 +20,7 @@ import org.apache.clerezza.platform.cont
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.utils.GraphNode;
-import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemImpl;
+import org.apache.stanbol.enhancer.servicesapi.impl.ContentItemImpl;
/**
*
Modified: incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaStore.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaStore.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaStore.java (original)
+++ incubator/stanbol/trunk/contenthub/store/clerezza/src/main/java/org/apache/stanbol/contenthub/store/clerezza/ClerezzaStore.java Sun Apr 8 15:12:40 2012
@@ -73,9 +73,10 @@ public class ClerezzaStore implements St
}
public String put(ContentItem ci) {
- MGraph metadataGraph = tcManager.getMGraph(new UriRef(ci.getUri().getUnicodeString()));
+ MGraph metadataGraph = tcManager.getMGraph(ci.getUri());
metadataGraph.clear();
metadataGraph.addAll(ci.getMetadata());
+ //TODO: handle ContentParts
return ci.getUri().getUnicodeString();
}
@@ -89,6 +90,7 @@ public class ClerezzaStore implements St
}
ContentItem contentItem = new ClerezzaContentItem(new GraphNode(uriRef,
cgProvider.getContentGraph()), metadataGraph, handler);
+ //TODO add other contentParts
return contentItem;
}
Modified: incubator/stanbol/trunk/contenthub/store/inmemory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/inmemory/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/inmemory/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/store/inmemory/pom.xml Sun Apr 8 15:12:40 2012
@@ -49,6 +49,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
Modified: incubator/stanbol/trunk/contenthub/store/inmemory/src/main/java/org/apache/stanbol/contenthub/store/inmemory/InMemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/inmemory/src/main/java/org/apache/stanbol/contenthub/store/inmemory/InMemoryStore.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/inmemory/src/main/java/org/apache/stanbol/contenthub/store/inmemory/InMemoryStore.java (original)
+++ incubator/stanbol/trunk/contenthub/store/inmemory/src/main/java/org/apache/stanbol/contenthub/store/inmemory/InMemoryStore.java Sun Apr 8 15:12:40 2012
@@ -16,6 +16,7 @@
*/
package org.apache.stanbol.contenthub.store.inmemory;
+import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -31,9 +32,10 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.contenthub.servicesapi.store.Store;
+import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
+import org.apache.stanbol.enhancer.servicesapi.impl.ByteArraySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,6 +51,8 @@ public class InMemoryStore implements St
private final Map<String, ContentItem> data = new HashMap<String, ContentItem>();
+ private final InMemoryContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance();
+
@Reference
private WeightedTcProvider tcProvider;
@@ -65,7 +69,12 @@ public class InMemoryStore implements St
log.debug("create ContentItem for id " + uri + " on TC Manager= "
+ tcProvider);
final MGraph g = new SimpleMGraph();
- return new InMemoryContentItem(uri.getUnicodeString(), content, mimeType, g);
+ try {
+ return ciFactory.createContentItem(uri, new ByteArraySource(content, mimeType), g);
+ } catch (IOException e) {
+ throw new IllegalStateException("IOException while creation of an in-memory" +
+ "ContentItem (that should never happen)!",e);
+ }
}
public ContentItem get(String id) {
Modified: incubator/stanbol/trunk/contenthub/store/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/solr/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/solr/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/store/solr/pom.xml Sun Apr 8 15:12:40 2012
@@ -54,6 +54,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
Modified: incubator/stanbol/trunk/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrContentItemImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrContentItemImpl.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrContentItemImpl.java (original)
+++ incubator/stanbol/trunk/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrContentItemImpl.java Sun Apr 8 15:12:40 2012
@@ -28,9 +28,9 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrContentItem;
import org.apache.stanbol.contenthub.store.solr.util.ContentItemIDOrganizer;
+import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryBlob;
import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
-import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemImpl;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryBlob;
+import org.apache.stanbol.enhancer.servicesapi.impl.ContentItemImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,10 @@ public class SolrContentItemImpl extends
MGraph metadata,
Map<String,List<Object>> constraints) {
super(id == null ? ContentItemHelper.makeDefaultUri(CONTENT_ITEM_URI_PREFIX, content) : new UriRef(
- ContentItemIDOrganizer.attachBaseURI(id)), new InMemoryBlob(content, mimeType),
+ ContentItemIDOrganizer.attachBaseURI(id)),
+ //using this deprecated constructor is OK as a major change to
+ //this component is done in an other branch (STANBOL-471)
+ new InMemoryBlob(content, mimeType),
metadata == null ? new SimpleMGraph() : metadata);
if (metadata == null) {
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/Benchmark.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/Benchmark.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/Benchmark.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/Benchmark.java Sun Apr 8 15:12:40 2012
@@ -19,6 +19,8 @@ package org.apache.stanbol.enhancer.benc
import java.util.List;
import org.apache.clerezza.rdf.core.Graph;
+import org.apache.stanbol.enhancer.servicesapi.Chain;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.EnhancementException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
@@ -30,10 +32,15 @@ public interface Benchmark extends List<
/** Benchmark input text */
String getInputText();
+ /** The enhancement chain used to execute the test */
+ Chain getChain();
+
/** Execute the benchmark and return results
* @return null */
- List<BenchmarkResult> execute(EnhancementJobManager jobManager) throws EnhancementException;
+ List<BenchmarkResult> execute(EnhancementJobManager jobManager,
+ ContentItemFactory ciFactory) throws EnhancementException;
/** Return the enhanced Graph of our input text */
- Graph getGraph(EnhancementJobManager jobManager) throws EnhancementException;
+ Graph getGraph(EnhancementJobManager jobManager,
+ ContentItemFactory ciFactory) throws EnhancementException;
}
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/BenchmarkParser.java Sun Apr 8 15:12:40 2012
@@ -25,6 +25,7 @@ public interface BenchmarkParser {
// Marker strings in the benchmark text input
String COMMENT_MARKER = "#";
String FIELD_SEPARATOR = ":";
+ String ENHANCEMENT_CHAIN = "= CHAIN =";
String INPUT_SECTION_MARKER = "= INPUT =";
String EXPECT_SECTION_MARKER = "= EXPECT =";
String COMPLAIN_SECTION_MARKER = "= COMPLAIN =";
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkImpl.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkImpl.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkImpl.java Sun Apr 8 15:12:40 2012
@@ -16,6 +16,7 @@
*/
package org.apache.stanbol.enhancer.benchmark.impl;
+import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
@@ -23,11 +24,12 @@ import org.apache.clerezza.rdf.core.Grap
import org.apache.stanbol.enhancer.benchmark.Benchmark;
import org.apache.stanbol.enhancer.benchmark.BenchmarkResult;
import org.apache.stanbol.enhancer.benchmark.TripleMatcherGroup;
+import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
-import org.apache.stanbol.enhancer.servicesapi.EngineException;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.EnhancementException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
+import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
@SuppressWarnings("serial")
public class BenchmarkImpl extends LinkedList<TripleMatcherGroup> implements Benchmark {
@@ -35,6 +37,8 @@ public class BenchmarkImpl extends Linke
private String name;
private String inputText;
private Graph graph;
+ private ContentItemFactory ciFactory;
+ private Chain chain;
/** Not public: meant to be constructed by parsing */
BenchmarkImpl() {
@@ -60,28 +64,49 @@ public class BenchmarkImpl extends Linke
return inputText;
}
+ /** @inheritDoc */
+ @Override
+ public Chain getChain(){
+ return chain;
+ }
+
+ void setChain(Chain chain){
+ this.chain = chain;
+ }
+
@Override
- public List<BenchmarkResult> execute(EnhancementJobManager jobManager) throws EnhancementException {
+ public List<BenchmarkResult> execute(EnhancementJobManager jobManager, ContentItemFactory ciFactory) throws EnhancementException {
if(isEmpty()) {
return null;
}
if(inputText == null || inputText.length() == 0) {
throw new IllegalStateException("inputText is null or empty, cannot run benchmark");
}
-
+
final List<BenchmarkResult> result = new LinkedList<BenchmarkResult>();
for(TripleMatcherGroup g : this) {
- result.add(new BenchmarkResultImpl(g, getGraph(jobManager)));
+ result.add(new BenchmarkResultImpl(g, getGraph(jobManager,ciFactory)));
}
return result;
}
/** @inheritDoc */
- public Graph getGraph(EnhancementJobManager jobManager) throws EnhancementException {
+ public Graph getGraph(EnhancementJobManager jobManager,
+ ContentItemFactory ciFactory) throws EnhancementException {
if(graph == null) {
- final ContentItem ci = new InMemoryContentItem(inputText.getBytes(), "text/plain");
- jobManager.enhanceContent(ci);
+ ContentItem ci;
+ try {
+ ci = ciFactory.createContentItem(new StringSource(inputText));
+ } catch (IOException e) {
+ throw new IllegalStateException("Unable to create a ContentItem" +
+ "using '"+ciFactory.getClass().getSimpleName()+"'!",e);
+ }
+ if(chain == null){
+ jobManager.enhanceContent(ci);
+ } else { //parsing null as chain does not work!
+ jobManager.enhanceContent(ci,chain);
+ }
graph = ci.getMetadata().getGraph();
}
return graph;
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkParserImpl.java Sun Apr 8 15:12:40 2012
@@ -23,22 +23,34 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.benchmark.Benchmark;
import org.apache.stanbol.enhancer.benchmark.BenchmarkParser;
+import org.apache.stanbol.enhancer.servicesapi.Chain;
+import org.apache.stanbol.enhancer.servicesapi.ChainManager;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
/** BenchmarkParser implementation */
@Component
@Service
public class BenchmarkParserImpl implements BenchmarkParser {
+
+ /**
+ * Needed to lookup active enhancement changes as parsed by {@link ChainState}
+ */
+ @Reference
+ private ChainManager chainManager;
+
private static class ParserContext {
List<BenchmarkImpl> benchmarks;
BenchmarkImpl currentBenchmark;
TripleMatcherGroupImpl currentGroup;
}
- private abstract static class State {
+ private abstract class State {
protected final ParserContext ctx;
State(ParserContext ctx) {
@@ -57,6 +69,8 @@ public class BenchmarkParserImpl impleme
return new MatcherGroupState(ctx, true);
} else if(COMPLAIN_SECTION_MARKER.equals(line)) {
return new MatcherGroupState(ctx, false);
+ } else if (ENHANCEMENT_CHAIN.equals(line)) {
+ return new ChainState(ctx);
} else {
return consume(line);
}
@@ -68,7 +82,7 @@ public class BenchmarkParserImpl impleme
/** Get field value if current line is in the form "KEY: value here",
* null if not.
*/
- protected static String getField(String line, String fieldName) {
+ protected String getField(String line, String fieldName) {
String value = null;
if(line.startsWith(fieldName + FIELD_SEPARATOR)) {
value = line.substring(line.indexOf(FIELD_SEPARATOR) + 1).trim();
@@ -82,7 +96,7 @@ public class BenchmarkParserImpl impleme
protected abstract State consume(String line) throws IOException;
}
- private static class InitState extends State {
+ private class InitState extends State {
InitState(ParserContext ctx) {
super(ctx);
}
@@ -92,7 +106,7 @@ public class BenchmarkParserImpl impleme
}
}
- private static class InputState extends State {
+ private class InputState extends State {
InputState(ParserContext ctx) {
super(ctx);
ctx.currentBenchmark = new BenchmarkImpl();
@@ -111,8 +125,25 @@ public class BenchmarkParserImpl impleme
return this;
}
}
-
- private static class MatcherGroupState extends State {
+ /* not a static class because its needs the #chainManager !*/
+ private class ChainState extends State {
+ ChainState(ParserContext ctx) {
+ super(ctx);
+ }
+
+ @Override
+ protected State consume(String line) throws IOException {
+ if(ctx.currentBenchmark.getChain() == null){
+ Chain chain = chainManager.getChain(line);
+ if(chain != null){
+ ctx.currentBenchmark.setChain(chain);
+ } //defined chain not active
+ } //do not override
+ return this;
+ }
+
+ }
+ private class MatcherGroupState extends State {
private final boolean isExpect;
MatcherGroupState(ParserContext ctx, boolean isExpect) {
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/java/org/apache/stanbol/enhancer/benchmark/impl/BenchmarkServlet.java Sun Apr 8 15:12:40 2012
@@ -38,6 +38,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.enhancer.benchmark.BenchmarkParser;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -64,6 +65,9 @@ public class BenchmarkServlet extends Ht
@Reference
private EnhancementJobManager jobManager;
+
+ @Reference
+ private ContentItemFactory ciFactory;
@Reference
private Serializer graphSerializer;
@@ -200,6 +204,7 @@ public class BenchmarkServlet extends Ht
final Template t = velocity.getTemplate("/velocity/benchmark-results.html");
final VelocityContext ctx = getVelocityContext(request, "Benchmark Results");
+ ctx.put("contentItemFactory", ciFactory);
ctx.put("jobManager", jobManager);
ctx.put("benchmarks", parser.parse(new StringReader(content)));
ctx.put("graphFormatter", new GraphFormatter(graphSerializer));
Modified: incubator/stanbol/trunk/enhancer/benchmark/src/main/resources/velocity/benchmark-results.html
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/benchmark/src/main/resources/velocity/benchmark-results.html?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/benchmark/src/main/resources/velocity/benchmark-results.html (original)
+++ incubator/stanbol/trunk/enhancer/benchmark/src/main/resources/velocity/benchmark-results.html Sun Apr 8 15:12:40 2012
@@ -47,12 +47,12 @@
Results:
</p>
<div class="collapsable">
- <pre>$esc.html($graphFormatter.format($benchmark.getGraph($jobManager), "text/turtle"))</pre>
+ <pre>$esc.html($graphFormatter.format($benchmark.getGraph($jobManager,$contentItemFactory), "text/turtle"))</pre>
</div>
</div>
</div>
- #foreach($result in $benchmark.execute($jobManager))
+ #foreach($result in $benchmark.execute($jobManager,$contentItemFactory))
<div class="result">
<div class="description">
$result.getTripleMatcherGroup().getDescription()
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=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml Sun Apr 8 15:12:40 2012
@@ -48,12 +48,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.chainmanager</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.enginemanager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/AllActiveEnginesChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/AllActiveEnginesChain.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/AllActiveEnginesChain.java (original)
+++ incubator/stanbol/trunk/enhancer/chain/allactive/src/main/java/org/apache/stanbol/enhancer/chain/allactive/impl/AllActiveEnginesChain.java Sun Apr 8 15:12:40 2012
@@ -31,7 +31,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-import org.apache.stanbol.enhancer.servicesapi.helper.EnginesTracker;
+import org.apache.stanbol.enhancer.servicesapi.impl.EnginesTracker;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified: incubator/stanbol/trunk/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java (original)
+++ incubator/stanbol/trunk/enhancer/chain/graph/src/main/java/org/apache/stanbol/enhancer/chain/graph/impl/GraphChain.java Sun Apr 8 15:12:40 2012
@@ -60,7 +60,7 @@ import org.apache.stanbol.commons.stanbo
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileTracker;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractChain;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractChain;
import org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionPlan;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationException;
Modified: incubator/stanbol/trunk/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java (original)
+++ incubator/stanbol/trunk/enhancer/chain/list/src/main/java/org/apache/stanbol/enhancer/chain/list/impl/ListChain.java Sun Apr 8 15:12:40 2012
@@ -40,8 +40,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractChain;
import org.apache.stanbol.enhancer.servicesapi.helper.ConfigUtils;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractChain;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
Modified: incubator/stanbol/trunk/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java (original)
+++ incubator/stanbol/trunk/enhancer/chain/weighted/src/main/java/org/apache/stanbol/enhancer/chain/weighted/impl/WeightedChain.java Sun Apr 8 15:12:40 2012
@@ -39,8 +39,8 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractChain;
-import org.apache.stanbol.enhancer.servicesapi.helper.EnginesTracker;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractChain;
+import org.apache.stanbol.enhancer.servicesapi.impl.EnginesTracker;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationException;
Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/pom.xml Sun Apr 8 15:12:40 2012
@@ -116,6 +116,16 @@
</dependency>
<!-- Testing -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java Sun Apr 8 15:12:40 2012
@@ -49,7 +49,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractEnhancementEngine;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses;
Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java Sun Apr 8 15:12:40 2012
@@ -33,10 +33,12 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.commons.io.IOUtils;
+import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
+import org.apache.stanbol.enhancer.rdfentities.RdfEntityFactory;
+import org.apache.stanbol.enhancer.rdfentities.fise.TextAnnotation;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
-import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
-import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -64,6 +66,8 @@ public class TestEntityLinkingEnhancemen
*/
public static final String PLACE = "New Zealand";
+ private static final ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance();
+
static NamedEntityTaggingEngine entityLinkingEngine
= new NamedEntityTaggingEngine();
@@ -83,8 +87,8 @@ public class TestEntityLinkingEnhancemen
public static void shutdownServices() {
}
- public static ContentItem getContentItem(final String id, final String text) {
- return new InMemoryContentItem(id, text, "text/plain");
+ public static ContentItem getContentItem(final String id, final String text) throws IOException {
+ return ciFactory.createContentItem(new UriRef(id),new StringSource(text));
}
public static void getTextAnnotation(ContentItem ci, String name,String context,UriRef type){
Modified: incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/pom.xml Sun Apr 8 15:12:40 2012
@@ -117,6 +117,16 @@
<!-- Dependencies for testing -->
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/main/java/org/apache/stanbol/enhancer/engines/geonames/impl/LocationEnhancementEngine.java Sun Apr 8 15:12:40 2012
@@ -59,8 +59,8 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum;
import org.apache.stanbol.commons.stanboltools.offline.OnlineMode;
import org.osgi.framework.Constants;
Modified: incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/geonames/src/test/java/org/apache/stanbol/enhancer/engines/geonames/impl/TestLocationEnhancementEngine.java Sun Apr 8 15:12:40 2012
@@ -42,11 +42,13 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.commons.io.IOUtils;
+import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
+import org.apache.stanbol.enhancer.rdfentities.RdfEntityFactory;
+import org.apache.stanbol.enhancer.rdfentities.fise.TextAnnotation;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
-import org.apache.stanbol.enhancer.servicesapi.TextAnnotation;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
-import org.apache.stanbol.enhancer.servicesapi.helper.RdfEntityFactory;
+import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -80,6 +82,7 @@ public class TestLocationEnhancementEngi
*/
public static final String PLACE = "New Zealand";
+ private static final ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance();
static LocationEnhancementEngine locationEnhancementEngine = new LocationEnhancementEngine();
@@ -101,8 +104,8 @@ public class TestLocationEnhancementEngi
}
public static ContentItem getContentItem(final String id,
- final String text) {
- return new InMemoryContentItem(id, text, "text/plain");
+ final String text) throws IOException {
+ return ciFactory.createContentItem(new UriRef(id), new StringSource(text));
}
public static void getTextAnnotation(ContentItem ci, String name, String context, UriRef type) {
@@ -130,7 +133,7 @@ public class TestLocationEnhancementEngi
}
@Test
- public void testLocationEnhancementEngine() {//throws Exception{
+ public void testLocationEnhancementEngine() throws IOException {
//create a content item
ContentItem ci = getContentItem("urn:org.apache:stanbol.enhancer:text:content-item:person", CONTEXT);
//add three text annotations to be consumed by this test
Modified: incubator/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/keywordextraction/pom.xml Sun Apr 8 15:12:40 2012
@@ -125,6 +125,11 @@
</dependency>
<!-- Testing -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.core</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java Sun Apr 8 15:12:40 2012
@@ -73,9 +73,9 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.InvalidContentException;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.Entityhub;
Modified: incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/TestTaxonomyLinker.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/TestTaxonomyLinker.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/TestTaxonomyLinker.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/TestTaxonomyLinker.java Sun Apr 8 15:12:40 2012
@@ -29,8 +29,10 @@ import java.util.Map;
import opennlp.tools.tokenize.SimpleTokenizer;
+import org.apache.clerezza.rdf.core.UriRef;
import org.apache.stanbol.commons.opennlp.OpenNLP;
import org.apache.stanbol.commons.opennlp.TextAnalyzer.TextAnalyzerConfig;
+import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.engines.keywordextraction.impl.ClasspathDataFileProvider;
import org.apache.stanbol.enhancer.engines.keywordextraction.impl.TestSearcherImpl;
import org.apache.stanbol.enhancer.engines.keywordextraction.linking.EntityLinker;
@@ -40,7 +42,8 @@ import org.apache.stanbol.enhancer.engin
import org.apache.stanbol.enhancer.engines.keywordextraction.linking.Suggestion;
import org.apache.stanbol.enhancer.engines.keywordextraction.linking.impl.OpenNlpAnalysedContentFactory;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
-import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem;
+import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory;
+import org.apache.stanbol.enhancer.servicesapi.impl.StringSource;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
import org.apache.stanbol.entityhub.servicesapi.defaults.NamespaceEnum;
@@ -67,6 +70,8 @@ public class TestTaxonomyLinker {
"candidates for Prime Minister in the upcoming US election has been rescheduled " +
"and shortend, to avoid a clash with popular cookery sow MasterChef.";
+ private static final ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance();
+
static TestSearcherImpl searcher;
static ValueFactory factory = InMemoryValueFactory.getInstance();
private static OpenNLP openNLP;
@@ -124,8 +129,8 @@ public class TestTaxonomyLinker {
public static void shutdownServices() {
}
- public static ContentItem getContentItem(final String id, final String text) {
- return new InMemoryContentItem(id, text, "text/plain");
+ public static ContentItem getContentItem(final String id, final String text) throws IOException {
+ return ciFactory.createContentItem(new UriRef(id),new StringSource(text));
}
@Test
Modified: incubator/stanbol/trunk/enhancer/engines/langid/src/main/java/org/apache/stanbol/enhancer/engines/langid/LangIdEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/langid/src/main/java/org/apache/stanbol/enhancer/engines/langid/LangIdEnhancementEngine.java?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/langid/src/main/java/org/apache/stanbol/enhancer/engines/langid/LangIdEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/langid/src/main/java/org/apache/stanbol/enhancer/engines/langid/LangIdEnhancementEngine.java Sun Apr 8 15:12:40 2012
@@ -39,9 +39,9 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.InvalidContentException;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-import org.apache.stanbol.enhancer.servicesapi.helper.AbstractEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
+import org.apache.stanbol.enhancer.servicesapi.impl.AbstractEnhancementEngine;
import org.apache.tika.language.LanguageIdentifier;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
Modified: incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/metaxa/pom.xml Sun Apr 8 15:12:40 2012
@@ -170,17 +170,14 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -198,7 +195,8 @@
<artifactId>slf4j-jdk14</artifactId>
<scope>provided</scope>
</dependency>
-
+
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>