svn commit: r961606 - in /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator: pom.xml src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java

[tommaso]

Author: tommaso
Date: Thu Jul  8 06:52:53 2010
New Revision: 961606

URL: http://svn.apache.org/viewvc?rev=961606&view=rev
Log:
[CLEREZZA-193] - added alchemyTags call inside generate method and fixed 
uimaj-ep-runtime dependency

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/pom.xml
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/pom.xml?rev=961606&r1=961605&r2=961606&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/pom.xml
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/pom.xml
 Thu Jul  8 06:52:53 2010
@@ -53,6 +53,10 @@
       <artifactId>org.apache.clerezza.jaxrs.testutils</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.uima</groupId>
+      <artifactId>uimaj-ep-runtime</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java?rev=961606&r1=961605&r2=961606&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGenerator.java
 Thu Jul  8 06:52:53 2010
@@ -8,6 +8,7 @@ import org.apache.clerezza.uima.utils.Ex
 import org.apache.clerezza.uima.utils.UIMAUtils;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.Services;
 import org.apache.uima.UIMAException;
 import org.apache.uima.cas.FeatureStructure;
 import org.apache.uima.jcas.tcas.Annotation;
@@ -19,8 +20,11 @@ import java.util.List;
  * An implementation of <code>MetaDataGenerator</code> generates meta data 
about specified data
  * depending on its media type using Apache UIMA.
  */
-...@component()
-...@service(MetaDataGenerator.class)
+...@component(metatype=true)
+...@services({
+  @Service(MetaDataGenerator.class),
+  @Service(UIMABaseMetadataGenerator.class)
+})
 public class UIMABaseMetadataGenerator implements MetaDataGenerator {
 
   private ExternalServicesFacade facade = new ExternalServicesFacade();
@@ -39,6 +43,9 @@ public class UIMABaseMetadataGenerator i
         // add calais annotations' nodes
         addCalaisAnnotations(node, data);
 
+        // add alchemyAPI's annotations' nodes
+        addAlchemyAPIEntities(node,data);
+
       } catch (Throwable e) {
         e.printStackTrace();
       }