You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by to...@apache.org on 2010/06/28 07:54:55 UTC
svn commit: r958467 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima:
./ org.apache.clerezza.uima.metadata-generator/
org.apache.clerezza.uima.metadata-generator/src/main/java/org/apache/clerezza/uima/metadatagenerator...
Author: tommaso
Date: Mon Jun 28 05:54:54 2010
New Revision: 958467
URL: http://svn.apache.org/viewvc?rev=958467&view=rev
Log:
[CLEREZZA-193] - added node generation in the graph for each entity/annotation for UIMA metadata generation
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.alchemyapi_2.3.1.SNAPSHOT.jar (with props)
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.opencalais_2.3.1.SNAPSHOT.jar (with props)
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/OpenCalaisAnnotator-2.3.0-incubating.jar
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/alchemy-annotator-2.3.0-incubating.jar
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
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.ontologies/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtils.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/pom.xml
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=958467&r1=958466&r2=958467&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 Mon Jun 28 05:54:54 2010
@@ -1,12 +1,12 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.uima.metadata-generator</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Apache Clerezza UIMA extension for metadata generation </name>
- <description>Apache Clerezza UIMA extension for metadata generation </description>
+ <name>Clerezza - Apache Clerezza UIMA extension for metadata generation</name>
+ <description>Apache Clerezza UIMA extension for metadata generation</description>
<parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.uima</artifactId>
@@ -24,6 +24,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.uima.ontologies</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
</dependency>
<dependency>
@@ -49,4 +54,18 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.clerezza.uima.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
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=958467&r1=958466&r2=958467&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 Mon Jun 28 05:54:54 2010
@@ -5,17 +5,19 @@ import org.apache.clerezza.rdf.ontologie
import org.apache.clerezza.rdf.ontologies.DCTERMS;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.apache.clerezza.uima.utils.ExternalServicesFacade;
+import org.apache.clerezza.uima.utils.UIMAUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.uima.UIMAException;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.jcas.tcas.Annotation;
import javax.ws.rs.core.MediaType;
+import java.util.List;
/**
- *
* An implementation of <code>MetaDataGenerator</code> generates meta data about specified data
- * depending on its media type using UIMA.
- *
+ * depending on its media type using Apache UIMA.
*/
@Component()
@Service(MetaDataGenerator.class)
@@ -30,11 +32,15 @@ public class UIMABaseMetadataGenerator i
try {
// add language to the document
addLanguage(node, data);
+
// add wide purpose subject to the document
addCategory(node, data);
-
+
+ // add calais annotations' nodes
+ addCalaisAnnotations(node, data);
+
} catch (Throwable e) {
- // quietly react to errors
+ e.printStackTrace();
}
}
}
@@ -42,13 +48,28 @@ public class UIMABaseMetadataGenerator i
private void addCategory(GraphNode node, byte[] data) throws UIMAException {
// get category to bind it to the node
String category = facade.getCategory(data.toString());
- node.addPropertyValue(DC.subject,category);
+ node.addPropertyValue(DC.subject, category);
}
private void addLanguage(GraphNode node, byte[] data) throws UIMAException {
- // get language to bind to the node
+ // get language to bind it to the node
String language = facade.getLanguage(data.toString());
- node.addPropertyValue(DCTERMS.language,language);
+ node.addPropertyValue(DCTERMS.language, language);
+ }
+
+ private void addCalaisAnnotations(GraphNode existingNode, byte[] data) throws UIMAException {
+ // analyze document text and get the corresponding OpenCalais annotations
+ List<Annotation> calaisAnnotations = facade.getCalaisAnnotations(data.toString());
+ // convert annotations to nodes inside the current graph
+ UIMAUtils.enhanceNode(existingNode, calaisAnnotations);
+
+ }
+
+ private void addAlchemyAPIEntities(GraphNode existingNode, byte[] data) throws UIMAException {
+ // analyze document text and get the corresponding AlchemyAPI Tags
+ List<FeatureStructure> alchemyAPIEntities = facade.getAlchemyAPITags(data.toString());
+ // convert entities to nodes inside the current graph
+ UIMAUtils.enhanceNode(existingNode, alchemyAPIEntities);
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.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/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.metadata-generator/src/test/java/org/apache/clerezza/uima/metadatagenerator/UIMABaseMetadataGeneratorTest.java Mon Jun 28 05:54:54 2010
@@ -1,14 +1,14 @@
package org.apache.clerezza.uima.metadatagenerator;
-import static org.junit.Assert.fail;
-
-import javax.ws.rs.core.MediaType;
-
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.utils.GraphNode;
import org.junit.Test;
+
+import javax.ws.rs.core.MediaType;
+
+import static org.junit.Assert.fail;
/**
* Testcase for {@link UIMABaseMetadataGenerator}
*
@@ -29,11 +29,11 @@ public class UIMABaseMetadataGeneratorTe
public void testGenerateMethodWithUnsupportedMediaType() {
try {
UIMABaseMetadataGenerator baseMetadataGenerator = new UIMABaseMetadataGenerator();
- byte[] data = new byte[]{};
+ String textToAnalyze = "Italy, the defending champions and four-time World Cup winners, suffer a shock World Cup defeat to Slovakia, who win a remarkable game 3-2 to book their place in the last 16";
MGraph mGraph = new SimpleMGraph();
GraphNode node = new GraphNode(new UriRef("test"), mGraph.getGraph());
MediaType mediaType = MediaType.valueOf("multipart/form-data; boundary=AaB03x");
- baseMetadataGenerator.generate(node, data, mediaType);
+ baseMetadataGenerator.generate(node, textToAnalyze.getBytes(), mediaType);
} catch (Exception e) {
fail(e.getLocalizedMessage());
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.ontologies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.ontologies/pom.xml?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.ontologies/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.ontologies/pom.xml Mon Jun 28 05:54:54 2010
@@ -1,7 +1,7 @@
<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>
- <groupId>org.apache.clerezza</groupId>
+ <groupId>org.apache.clerezza.uima</groupId>
<artifactId>org.apache.clerezza.uima.ontologies</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.alchemyapi_2.3.1.SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.alchemyapi_2.3.1.SNAPSHOT.jar?rev=958467&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.alchemyapi_2.3.1.SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.opencalais_2.3.1.SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.opencalais_2.3.1.SNAPSHOT.jar?rev=958467&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/lib/org.apache.uima.opencalais_2.3.1.SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/pom.xml?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/pom.xml Mon Jun 28 05:54:54 2010
@@ -14,18 +14,23 @@
</parent>
<dependencies>
<dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.utils</artifactId>
+ <version>0.13-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.uima</groupId>
<artifactId>alchemy-annotator</artifactId>
- <version>2.3.0-incubating</version>
+ <version>2.3.1.SNAPSHOT</version>
<scope>system</scope>
- <systemPath>${project.basedir}/lib/alchemy-annotator-2.3.0-incubating.jar</systemPath>
+ <systemPath>${project.basedir}/lib/org.apache.uima.alchemyapi_2.3.1.SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>OpenCalaisAnnotator</artifactId>
- <version>2.3.0-incubating</version>
+ <version>2.3.1.SNAPSHOT</version>
<scope>system</scope>
- <systemPath>${project.basedir}/lib/OpenCalaisAnnotator-2.3.0-incubating.jar</systemPath>
+ <systemPath>${project.basedir}/lib/org.apache.uima.opencalais_2.3.1.SNAPSHOT.jar</systemPath>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -39,5 +44,35 @@
<version>2.0</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-ep-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.uima</groupId>
+ <artifactId>org.apache.clerezza.uima.ontologies</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>org.apache.uima.*,*</Import-Package>
+ <Export-Package>org.apache.clerezza.*,org.apache.uima.calais.*</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtils.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtils.java?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtils.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/main/java/org/apache/clerezza/uima/utils/UIMAUtils.java Mon Jun 28 05:54:54 2010
@@ -1,19 +1,22 @@
package org.apache.clerezza.uima.utils;
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.clerezza.rdf.utils.GraphNode;
+import org.apache.clerezza.uima.ontologies.ENTITY;
import org.apache.clerezza.uima.utils.exception.FeatureStructureNotFoundException;
import org.apache.clerezza.uima.utils.exception.NotSingletonFeatureStructureException;
import org.apache.uima.cas.FSIterator;
+import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.Lock;
+
/**
* Utilities for managing UIMA data and features
- *
*/
public class UIMAUtils {
@@ -47,12 +50,54 @@ public class UIMAUtils {
}
public static List<Annotation> getAllAnnotationsOfType(int type, JCas cas) {
- List<Annotation> foundAnnotations = new ArrayList<Annotation>();
- AnnotationIndex<Annotation> annotationIndex = cas.getAnnotationIndex(type);
- for (Annotation annotation : annotationIndex) {
- foundAnnotations.add(annotation);
+ List<Annotation> foundAnnotations = new ArrayList<Annotation>();
+ AnnotationIndex<Annotation> annotationIndex = cas.getAnnotationIndex(type);
+ for (Annotation annotation : annotationIndex) {
+ foundAnnotations.add(annotation);
+ }
+ return foundAnnotations;
+ }
+
+ public static void enhanceNode(GraphNode existingNode, List<? extends FeatureStructure> uimaObjects) {
+ Lock lock = existingNode.writeLock();
+ try {
+ lock.lock();
+ for (FeatureStructure uimaObject : uimaObjects) {
+ // create a new node for the current Annotation
+ GraphNode annotationNode = new GraphNode(ENTITY.Annotation, existingNode.getGraph());
+
+ // set Annotation specific properties for the node
+ if (uimaObject instanceof Annotation) {
+ Annotation annotation = (Annotation) uimaObject;
+ annotationNode.addPropertyValue(ENTITY.begin, annotation.getBegin());
+ annotationNode.addPropertyValue(ENTITY.end, annotation.getEnd());
+ }
+
+ //XXX : in OpenCalais the type is an URI so it maybe reasonable to put another node here
+ annotationNode.addPropertyValue(ENTITY.uimaType, uimaObject.getType().getName());
+
+ /* inspect features of the annotation */
+ for (Feature feature : uimaObject.getType().getFeatures()) {
+
+ // create a new feature node
+ GraphNode featureNode = new GraphNode(ENTITY.Feature, existingNode.getGraph());
+ // set feature name and value if not null
+ featureNode.addPropertyValue(ENTITY.featureName, feature.getName());
+ FeatureStructure featureValue = uimaObject.getFeatureValue(feature);
+ if (featureValue != null)
+ featureNode.addPropertyValue(ENTITY.featureValue, featureValue);
+
+ // add feature to the annotation node
+ annotationNode.addProperty(ENTITY.hasFeature, featureNode.getNode());
+ }
+
+ // finally add the triple existingNode,ENTITY.contains,calaisNode
+ existingNode.addProperty(ENTITY.contains, annotationNode.getNode());
+
}
- return foundAnnotations;
+ } finally {
+ lock.unlock();
+ }
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/org.apache.clerezza.uima.utils/src/test/java/org/apache/clerezza/uima/utils/ExternalServicesFacadeTest.java Mon Jun 28 05:54:54 2010
@@ -20,6 +20,8 @@ public class ExternalServicesFacadeTest
private static final String CLEREZZA_RELATED_TEXT = "Clerezza is fully based on OSGi. OSGi is a very lightweight approach to offer the modularization and dynamism missing in standard Java. By using OSGi services it can also interoperate with Spring-DS or Peaberry applications";
+ private static final String ANOTHER_ENGLISH_TEXT ="President Obama vows to \"make BP pay\" for the Gulf oil spill, and says the US must end its fossil fuel \"addiction\".";
+
@Test
public void getLanguageTest() {
try {
@@ -67,11 +69,15 @@ public class ExternalServicesFacadeTest
Map<String, Object> parameterSettings = new HashMap<String, Object>();
parameterSettings.put("licenseID", licenseId);
externalServicesFacade.setParameterSetting(parameterSettings);
- List<Annotation> calaisAnnotations = externalServicesFacade.getCalaisAnnotations(AN_ENGLISH_TEXT);
+ List<Annotation> calaisAnnotations = externalServicesFacade.getCalaisAnnotations(ANOTHER_ENGLISH_TEXT);
assertTrue(calaisAnnotations != null);
assertTrue(!calaisAnnotations.isEmpty());
- assertTrue(calaisAnnotations.size() == 1);
- assertTrue(calaisAnnotations.get(0).getCoveredText().equals("Queen Elizabeth"));
+ for (Annotation annotation : calaisAnnotations) {
+ assertTrue(annotation.getType()!=null && annotation.getType().getName()!=null);
+ assertTrue(annotation.getBegin()>0);
+ assertTrue(annotation.getEnd()>0);
+ assertTrue(annotation.getCoveredText()!=null);
+ }
}
catch (Exception e) {
e.printStackTrace();
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/pom.xml?rev=958467&r1=958466&r2=958467&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.uima/pom.xml Mon Jun 28 05:54:54 2010
@@ -14,9 +14,9 @@
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<modules>
- <module>org.apache.clerezza.uima.metadata-generator</module>
- <module>org.apache.clerezza.uima.utils</module>
<module>org.apache.clerezza.uima.ontologies</module>
+ <module>org.apache.clerezza.uima.utils</module>
+ <module>org.apache.clerezza.uima.metadata-generator</module>
</modules>
<dependencies>
<dependency>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>2.3.0.incubating</version>
+ <version>2.3.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>