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/11/25 10:11:47 UTC
svn commit: r1413303 [1/3] - in /stanbol/branches/stanbol-nlp-processing:
data/opennlp/ data/opennlp/lang/da/ data/opennlp/lang/da/src/
data/opennlp/lang/de/ data/opennlp/lang/de/src/ data/opennlp/lang/en/
data/opennlp/lang/es/ data/opennlp/lang/es/src...
Author: rwesten
Date: Sun Nov 25 09:11:39 2012
New Revision: 1413303
URL: http://svn.apache.org/viewvc?rev=1413303&view=rev
Log:
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.
Added:
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/main/resources/README
- copied unchanged from r1413177, stanbol/trunk/enhancer/engines/refactor/src/main/resources/README
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/
- copied from r1413199, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/contentitem.ftl
- copied unchanged from r1413199, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/ajax/contentitem.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource/sparql.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/html/org/apache/stanbol/enhancer/jersey/resource/StoreRootResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/contentitem.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/contentitem.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/doc/
- copied from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/doc/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/doc/enhancerbase.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/doc/enhancerbase.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/doc/executionplan.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/doc/executionplan.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/doc/multipartcontentitem.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/doc/multipartcontentitem.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enginesDescription.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/enhancersparql.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancersparql.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/enhancerweb.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/entities.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/entities.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/templates/imports/executionmetadata.ftl
- copied unchanged from r1413168, stanbol/trunk/enhancer/jersey/src/main/resources/templates/imports/executionmetadata.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl
- copied unchanged from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource/index.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/
- copied from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl
- copied unchanged from r1413169, stanbol/trunk/enhancer/topic-web/src/main/resources/templates/html/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource/index.ftl
Removed:
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/src/
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/src/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/ajax/contentitem.ftl
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/imports/
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/resources/org/apache/stanbol/enhancer/jersey/templates/org/
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/resources/org/apache/stanbol/enhancer/web/topic/templates/org/
Modified:
stanbol/branches/stanbol-nlp-processing/data/opennlp/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml
stanbol/branches/stanbol-nlp-processing/data/registries/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sites/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/ (props changed)
stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml
stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/chain/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/list/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/chain/weighted/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/Constants.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitylinking/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/geonames/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langdetect/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/langid/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/metaxa/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/opencalais/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/pom.xml (contents, props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/tika/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/zemanta/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/generic/core/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/parent/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml (contents, props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/tools/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/data/opennlp:1386990-1388016
+/stanbol/trunk/data/opennlp:1388017-1413177
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/da/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.da</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Danish</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/de/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.de</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for German</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,6 +1,7 @@
target
+bin
+downloads
.classpath
.project
.settings
-bin
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/en/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.en</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for English</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,7 +1,7 @@
+target
+bin
+downloads
+.classpath
.project
-
.settings
-target
-
-.classpath
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/es/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.es</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Spanish</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -88,8 +95,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -101,16 +108,16 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="sf.model.url" value="${opennlp.model.home}"/>
- <property name="git.model.url" value="${opennlp.git.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="sf.model.url" value="${opennlp.model.home}" />
+ <property name="git.model.url" value="${opennlp.git.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/nl/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.nl</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Dutch</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/pt/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.pt</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Portuguese</name>
@@ -46,8 +45,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -86,8 +93,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -99,15 +106,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/lang/sv/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.lang.sv</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP Models for Swedish</name>
@@ -49,8 +48,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -89,8 +96,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -102,15 +109,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,6 +1,7 @@
target
+bin
+downloads
.classpath
.project
.settings
-bin
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/en/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for English</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/es/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.es</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Spanish</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,5 +1,7 @@
+target
+bin
+downloads
.classpath
.project
-target
.settings
Modified: stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/opennlp/ner/nl/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,20 +15,19 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.nl</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: OpenNLP NER Models for Dutch</name>
@@ -47,8 +46,16 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <downloadWarning>
+*
+* WARNING - this build downloads some OpenNLP files that are *not*
+* licensed under the Apache License, and have more restrictive usage
+* terms than the Apache Stanbol code. See STANBOL-545 for more
+* information: https://issues.apache.org/jira/browse/STANBOL-545
+*
+ </downloadWarning>
<!-- define the path to/home of the OpenNLP modles-->
<opennlp.model.path>org/apache/stanbol/data/opennlp</opennlp.model.path>
<opennlp.model.home>http://dev.iks-project.eu/downloads/opennlp/models-1.5</opennlp.model.home>
@@ -87,8 +94,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -100,15 +107,15 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${opennlp.model.path}"/>
- <property name="model.url" value="${opennlp.model.home}"/>
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${opennlp.model.path}" />
+ <property name="model.url" value="${opennlp.model.home}" />
- <echo message="copy OpenNLP models"/>
- <echo message=" FROM ${model.url} "/>
- <echo message=" TO ${target.directory}"/>
+ <echo message="copy OpenNLP models" />
+ <echo message=" FROM ${model.url} " />
+ <echo message=" TO ${target.directory}" />
<ant antfile="${basedir}/download_models.xml">
- <target name="download"/>
+ <target name="download" />
</ant>
</target>
</configuration>
Propchange: stanbol/branches/stanbol-nlp-processing/data/registries/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/data/registries:1386990-1388016
+/stanbol/trunk/data/registries:1388017-1413179
Modified: stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/registries/default/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,21 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.registries.default</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Default ontology registries</name>
@@ -48,9 +47,6 @@
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<build>
<plugins>
@@ -63,8 +59,8 @@
<configuration>
<instructions>
<!-- Header used to load the provided configurations -->
- <Data-Files>org/apache/stanbol/data/registries/default</Data-Files>
- <Data-Files-Priority>-100</Data-Files-Priority>
+ <Data-Files>org/apache/stanbol/data/registries/default</Data-Files>
+ <Data-Files-Priority>-100</Data-Files-Priority>
</instructions>
</configuration>
</plugin>
Propchange: stanbol/branches/stanbol-nlp-processing/data/sites/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,2 @@
+/incubator/stanbol/trunk/data/sites:1386990-1388016
+/stanbol/trunk/data/sites:1388017-1413177
Propchange: stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 25 09:11:39 2012
@@ -1,4 +1,6 @@
+target
+bin
+downloads
.classpath
.project
.settings
-target
Modified: stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sites/dbpedia/pom.xml Sun Nov 25 09:11:39 2012
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: DBpedia.org</name>
@@ -108,8 +108,8 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>compile</id>
- <phase>compile</phase>
+ <id>download</id>
+ <phase>generate-resources</phase>
<configuration>
<!--
TODO: I would like to add an "unless" constraint to the
@@ -121,7 +121,7 @@
available!
-->
<target>
- <property name="target.directory" value="${project.basedir}/src/main/resources/${dbpedia.default.index.path}" />
+ <property name="target.directory" value="${project.basedir}/downloads/resources/${dbpedia.default.index.path}" />
<property name="index.url" value="${dbpedia.default.index.url}" />
<echo message="copy Solr Index " />
Modified: stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/data/sites/dbpediacached/pom.xml Sun Nov 25 09:11:39 2012
@@ -15,21 +15,20 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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.data.parent</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia.cached</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Data: Remote DBpedia.org with local cache</name>
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/benchmark:1374978-1386535
+/incubator/stanbol/trunk/enhancer/benchmark:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/benchmark:1388017-1413169
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/pom.xml Sun Nov 25 09:11:39 2012
@@ -33,12 +33,12 @@
<name>Apache Stanbol Enhancer Benchmark</name>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/benchmark/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/benchmark/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/benchmark/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/benchmark/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/benchmark/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,22 +1,29 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache Software License, Version 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:15 CET 2012
+#Sun Oct 07 16:08:25 CEST 2012
antlr--antlr--2.7.2=Public Domain
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/chain/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/chain:1374978-1386535
+/incubator/stanbol/trunk/enhancer/chain:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/chain:1388017-1413168
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/pom.xml Sun Nov 25 09:11:39 2012
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/allactive/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/allactive/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/allactive/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/allactive/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,11 +57,12 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.allactive;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.allactive.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.allactive.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/allactive/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:00 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:07:53 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/pom.xml Sun Nov 25 09:11:39 2012
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/graph/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/graph/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/chain/graph/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/chain/graph/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,11 +58,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.enhancer.chain.graph;version=${project.version}
- </Export-Package>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Private-Package>
- org.apache.stanbol.enhancer.chain.graph.impl;version=${project.version}
+ org.apache.stanbol.enhancer.chain.graph.impl
</Private-Package>
</instructions>
</configuration>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/chain/graph/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:02 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:07:56 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0