Author: rwesten
Date: Fri Jun 1 12:01:39 2012
New Revision: 1345093
URL: http://svn.apache.org/viewvc?rev=1345093&view=rev
Log:
STANBOL-583: Merged the CELI engines back into trunk
NOTE: Commented the CELI engines in the bundlelist for the enhancer. We need to
first decide on a strategy on the default configuration for those Engines (will
write a mail about that on the stanbol-dev list soon.
Added:
incubator/stanbol/trunk/enhancer/engines/celi/ (props changed)
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/
incubator/stanbol/trunk/enhancer/engines/celi/pom.xml
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/pom.xml
incubator/stanbol/trunk/enhancer/engines/celi/src/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngine.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/ClassificationClientHTTP.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/ClassificationClientHTTP.java
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/Concept.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/Concept.java
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/langid/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/langid/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/ner/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/ner/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/utils/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/utils/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/utils/Utils.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/java/org/apache/stanbol/enhancer/engines/celi/utils/Utils.java
incubator/stanbol/trunk/enhancer/engines/celi/src/main/resources/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/resources/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/resources/OSGI-INF/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/resources/OSGI-INF/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/resources/OSGI-INF/metatype/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/resources/OSGI-INF/metatype/
incubator/stanbol/trunk/enhancer/engines/celi/src/main/resources/OSGI-INF/metatype/metatype.properties
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/main/resources/OSGI-INF/metatype/metatype.properties
incubator/stanbol/trunk/enhancer/engines/celi/src/test/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/classification/impl/CeliClassificationEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/langid/impl/CeliLanguageIdentifierEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/lemmatizer/impl/CeliLemmatizerEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/ner/impl/CeliNamedEntityExtractionEnhancementEngineTest.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java
- copied unchanged from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/TestUtils.java
incubator/stanbol/trunk/enhancer/engines/celi/src/test/resources/
- copied from r1345045,
incubator/stanbol/branches/celi-enhancement-engines/engines/celi/src/test/resources/
Modified:
incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/engines/pom.xml
Modified: incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml?rev=1345093&r1=1345092&r2=1345093&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml Fri
Jun 1 12:01:39 2012
@@ -177,6 +177,14 @@
<artifactId>org.apache.stanbol.enhancer.engines.geonames</artifactId>
<version>0.10.0-incubating-SNAPSHOT</version>
</bundle>
+ <!-- http://linguagrid.org/ -->
+ <!-- STANBOL-583: Deactivated until a decision if the linguagrid.org
+ Engines should be activated if no license is available
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engines.celi</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ </bundle> -->
</startLevel>
<!-- Default Configuration for the Stanbol Enhancer -->
Propchange: incubator/stanbol/trunk/enhancer/engines/celi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 1 12:01:39 2012
@@ -0,0 +1,7 @@
+.classpath
+
+.project
+
+target
+
+.settings
Modified: incubator/stanbol/trunk/enhancer/engines/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/pom.xml?rev=1345093&r1=1345092&r2=1345093&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/pom.xml Fri Jun 1 12:01:39 2012
@@ -47,12 +47,13 @@
<module>topic</module>
<module>metaxa</module>
<module>tika</module>
- <module>geonames</module>
<module>entitytagging</module>
<module>keywordextraction</module>
<module>refactor</module>
-
- <module>opencalais</module>
- <module>zemanta</module>
+ <!-- Enhancement Engines using external services -->
+ <module>celi</module> <!-- http://linguagrid.org -->
+ <module>geonames</module> <!-- http://geonames.org -->
+ <module>opencalais</module> <!-- http://opencalais.com/ -->
+ <module>zemanta</module> <!-- htt://zemanta.com -->
</modules>
</project>
