refs/heads/stanbol-nlp-processing - stanbol

commit	3f95f10848c5aeb1d9c71e9d6add1aea27fe63fa	[log] [tgz]
author	Rupert Westenthaler <rwesten@apache.org>	Sun Nov 25 09:11:39 2012 +0000
committer	Rupert Westenthaler <rwesten@apache.org>	Sun Nov 25 09:11:39 2012 +0000
tree	7c5f61d354576b47738c6027dfc95671e82fcb68
parent	24af00f3601c13b76f7d655f4afdb1dad1719018 [diff]

STANBOL 733: merged (nearly all) changes from the trunk to this branch. Only the moved bundlelists where not merged, because they where moved to a location that is not part of this branch.

git-svn-id: https://svn.apache.org/repos/asf/stanbol/branches/stanbol-nlp-processing@1413303 13f79535-47bb-0310-9956-ffa450edef68

data/opennlp/lang/da/pom.xml[diff]
data/opennlp/lang/de/pom.xml[diff]
data/opennlp/lang/en/pom.xml[diff]
data/opennlp/lang/es/pom.xml[diff]
data/opennlp/lang/nl/pom.xml[diff]
data/opennlp/lang/pt/pom.xml[diff]
data/opennlp/lang/sv/pom.xml[diff]
data/opennlp/ner/en/pom.xml[diff]
data/opennlp/ner/es/pom.xml[diff]
data/opennlp/ner/nl/pom.xml[diff]
data/registries/default/pom.xml[diff]
data/sites/dbpedia/pom.xml[diff]
data/sites/dbpediacached/pom.xml[diff]
enhancer/benchmark/pom.xml[diff]
enhancer/benchmark/src/license/THIRD-PARTY.properties[diff]
enhancer/chain/allactive/pom.xml[diff]
enhancer/chain/allactive/src/license/THIRD-PARTY.properties[diff]
enhancer/chain/graph/pom.xml[diff]
enhancer/chain/graph/src/license/THIRD-PARTY.properties[diff]
enhancer/chain/list/pom.xml[diff]
enhancer/chain/list/src/license/THIRD-PARTY.properties[diff]
enhancer/chain/weighted/pom.xml[diff]
enhancer/chain/weighted/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/celi/pom.xml[diff]
enhancer/engines/celi/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java[diff]
enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java[diff]
enhancer/engines/dbpedia-spotlight/pom.xml[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java[diff]
enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java[diff]
enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java[diff]
enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java[diff]
enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java[diff]
enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java[diff]
enhancer/engines/entitytagging/pom.xml[diff]
enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java[diff]
enhancer/engines/langdetect/pom.xml[diff]
enhancer/engines/langid/pom.xml[diff]
enhancer/engines/langid/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/metaxa/pom.xml[diff]
enhancer/engines/metaxa/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/opencalais/pom.xml[diff]
enhancer/engines/opencalais/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/pom.xml[diff]
enhancer/engines/refactor/pom.xml[diff]
enhancer/engines/refactor/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java[diff]
enhancer/engines/refactor/src/main/resources/README[Added - diff]
enhancer/engines/tika/pom.xml[diff]
enhancer/engines/tika/src/license/THIRD-PARTY.properties[diff]
enhancer/engines/zemanta/pom.xml[diff]
enhancer/generic/rdfentities/pom.xml[diff]
enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties[diff]
enhancer/jersey/pom.xml[diff]
enhancer/jersey/src/license/THIRD-PARTY.properties[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java[diff]
enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java[diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/contentitem.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/ajax/contentitem.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl - diff]
enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/contentitem.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/contentitem.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/doc/enhancerbase.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/enhancerbase.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/doc/executionplan.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/executionplan.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/doc/multipartcontentitem.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/doc/multipartcontentitem.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enginesDescription.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/enhancersparql.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancersparql.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/enhancerweb.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/entities.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/entities.ftl - diff]
enhancer/jersey/src/main/resources/templates/imports/executionmetadata.ftl[Renamed from enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/executionmetadata.ftl - diff]
enhancer/jobmanager/event/pom.xml[diff]
enhancer/jobmanager/event/src/license/THIRD-PARTY.properties[diff]
enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java[diff]
enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java[diff]
enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties[diff]
enhancer/jobmanager/pom.xml[diff]
enhancer/jobmanager/weightedjobmanager/pom.xml[diff]
enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties[diff]
enhancer/ldpath/pom.xml[diff]
enhancer/ldpath/src/license/THIRD-PARTY.properties[diff]
enhancer/parent/pom.xml[diff]
enhancer/pom.xml[diff]
enhancer/topic-web/pom.xml[diff]
enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java[diff]
enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java[diff]
enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java[diff]
enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl[Renamed from enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl - diff]
enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl[Renamed from enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl - diff]

103 files changed

tree: 7c5f61d354576b47738c6027dfc95671e82fcb68