Author: rwesten
Date: Thu May 16 13:48:39 2013
New Revision: 1483366
URL: http://svn.apache.org/r1483366
Log:
STANBOL-1072: added NlpProcessingRole.NamedEntityRecognition
Modified:
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/pom.xml
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/CustomNERModelEnhancementEngine.java
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
Modified: stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/pom.xml?rev=1483366&r1=1483365&r2=1483366&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/pom.xml Thu May 16
13:48:39 2013
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified:
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/CustomNERModelEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/CustomNERModelEnhancementEngine.java?rev=1483366&r1=1483365&r2=1483366&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/CustomNERModelEnhancementEngine.java
(original)
+++
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/CustomNERModelEnhancementEngine.java
Thu May 16 13:48:39 2013
@@ -16,6 +16,8 @@
*/
package org.apache.stanbol.enhancer.engines.opennlp.impl;
+import static
org.apache.stanbol.enhancer.nlp.NlpServiceProperties.ENHANCEMENT_ENGINE_NLP_ROLE;
+
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
@@ -41,6 +43,8 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.commons.opennlp.OpenNLP;
import
org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileListener;
import
org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileTracker;
+import org.apache.stanbol.enhancer.nlp.NlpProcessingRole;
+import org.apache.stanbol.enhancer.nlp.NlpServiceProperties;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
import org.osgi.framework.Constants;
@@ -100,6 +104,15 @@ public class CustomNERModelEnhancementEn
* {@link ServiceProperties#ORDERING_CONTENT_EXTRACTION}
*/
public static final Integer defaultOrder = ORDERING_CONTENT_EXTRACTION;
+
+ private static final Map<String,Object> SERVICE_PROPERTIES;
+ static {
+ Map<String,Object> sp = new HashMap<String,Object>();
+ sp.put(ENHANCEMENT_ENGINE_ORDERING,defaultOrder);
+ sp.put(ENHANCEMENT_ENGINE_NLP_ROLE,
NlpProcessingRole.NamedEntityRecognition);
+ SERVICE_PROPERTIES = Collections.unmodifiableMap(sp);
+
+ }
/**
* Bind method of {@link NEREngineCore#openNLP}
* @param openNlp
@@ -218,8 +231,7 @@ public class CustomNERModelEnhancementEn
@Override
public Map<String,Object> getServiceProperties() {
- return
Collections.unmodifiableMap(Collections.singletonMap(ENHANCEMENT_ENGINE_ORDERING,
- (Object) defaultOrder));
+ return SERVICE_PROPERTIES;
}
private class NamedModelFileListener implements DataFileListener {
Modified:
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java?rev=1483366&r1=1483365&r2=1483366&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
(original)
+++
stanbol/trunk/enhancement-engines/opennlp/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
Thu May 16 13:48:39 2013
@@ -16,10 +16,13 @@
*/
package org.apache.stanbol.enhancer.engines.opennlp.impl;
+import static
org.apache.stanbol.enhancer.nlp.NlpServiceProperties.ENHANCEMENT_ENGINE_NLP_ROLE;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import org.apache.felix.scr.annotations.Component;
@@ -30,6 +33,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.opennlp.OpenNLP;
+import org.apache.stanbol.enhancer.nlp.NlpProcessingRole;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
import org.osgi.framework.Constants;
@@ -87,6 +91,15 @@ public class NamedEntityExtractionEnhanc
* {@link ServiceProperties#ORDERING_CONTENT_EXTRACTION}
*/
public static final Integer defaultOrder = ORDERING_CONTENT_EXTRACTION;
+
+ private static final Map<String,Object> SERVICE_PROPERTIES;
+ static {
+ Map<String,Object> sp = new HashMap<String,Object>();
+ sp.put(ENHANCEMENT_ENGINE_ORDERING,defaultOrder);
+ sp.put(ENHANCEMENT_ENGINE_NLP_ROLE,
NlpProcessingRole.NamedEntityRecognition);
+ SERVICE_PROPERTIES = Collections.unmodifiableMap(sp);
+
+ }
/**
* Bind method of {@link NEREngineCore#openNLP}
* @param openNlp
@@ -145,8 +158,7 @@ public class NamedEntityExtractionEnhanc
@Override
public Map<String,Object> getServiceProperties() {
- return
Collections.unmodifiableMap(Collections.singletonMap(ENHANCEMENT_ENGINE_ORDERING,
- (Object) defaultOrder));
+ return SERVICE_PROPERTIES;
}
// @Override
