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 2014/01/10 08:27:56 UTC

svn commit: r1557043 - in /stanbol/branches/release-0.12: enhancement-engines/ enhancement-engines/pos-chunker/ enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/ launchers/bundlelists/enhancer/ launche...

Author: rwesten
Date: Fri Jan 10 07:27:56 2014
New Revision: 1557043

URL: http://svn.apache.org/r1557043
Log:
STANBOL-1251: merged Pos-Chunker engine to 0.12 branch

Added:
    stanbol/branches/release-0.12/enhancement-engines/pos-chunker/   (props changed)
      - copied from r1556839, stanbol/trunk/enhancement-engines/pos-chunker/
Modified:
    stanbol/branches/release-0.12/enhancement-engines/pom.xml
    stanbol/branches/release-0.12/enhancement-engines/pos-chunker/pom.xml
    stanbol/branches/release-0.12/enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/PosChunkerEngine.java
    stanbol/branches/release-0.12/launchers/bundlelists/enhancer/   (props changed)
    stanbol/branches/release-0.12/launchers/bundlelists/enhancer/src/main/bundles/list.xml

Modified: stanbol/branches/release-0.12/enhancement-engines/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/pom.xml?rev=1557043&r1=1557042&r2=1557043&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/pom.xml (original)
+++ stanbol/branches/release-0.12/enhancement-engines/pom.xml Fri Jan 10 07:27:56 2014
@@ -59,6 +59,7 @@
 	  <module>langdetect</module>
     <module>langid</module>
     <module>opennlp</module>
+    <module>pos-chunker</module>
 
     <!-- Chinese language support -->
     <module>smartcn-token</module> <!-- sentence detection and tokenizing -->

Propchange: stanbol/branches/release-0.12/enhancement-engines/pos-chunker/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan 10 07:27:56 2014
@@ -0,0 +1,7 @@
+.settings
+
+.project
+
+.classpath
+
+target

Modified: stanbol/branches/release-0.12/enhancement-engines/pos-chunker/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/pos-chunker/pom.xml?rev=1557043&r1=1556839&r2=1557043&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/pos-chunker/pom.xml (original)
+++ stanbol/branches/release-0.12/enhancement-engines/pos-chunker/pom.xml Fri Jan 10 07:27:56 2014
@@ -14,8 +14,8 @@
 
   <parent>
     <groupId>org.apache.stanbol</groupId>
-    <artifactId>apache-stanbol-enhancement-engines</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <artifactId>apache-stanbol-enhancement-engines-opennlp</artifactId>
+    <version>0.10.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -24,8 +24,8 @@
 
   <name>Apache Stanbol Enhancement Engine : POS tag based Chunker</name>
   <description>
-	    Uses POS tag information of Tokens to create Noun and Verb phrases.
-	</description>
+    Uses POS tag information of Tokens to create Noun and Verb phrases.
+  </description>
 
   <inceptionYear>2014</inceptionYear>
 
@@ -52,8 +52,8 @@
         <configuration>
           <instructions>
             <Import-Package>
-              org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
-              org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
+              org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.10,0.12)",
+              org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.10,0.12)",
               *
             </Import-Package>
             <!-- Export the PhraseBuilder and PhraseTypeDefinition -->
@@ -88,12 +88,12 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>0.10.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>0.10.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Modified: stanbol/branches/release-0.12/enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/PosChunkerEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/PosChunkerEngine.java?rev=1557043&r1=1556839&r2=1557043&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/PosChunkerEngine.java (original)
+++ stanbol/branches/release-0.12/enhancement-engines/pos-chunker/src/main/java/org/apache/stanbol/enhancer/engines/poschunker/engine/PosChunkerEngine.java Fri Jan 10 07:27:56 2014
@@ -16,15 +16,12 @@
 
 package org.apache.stanbol.enhancer.engines.poschunker.engine;
 
-import static org.apache.stanbol.enhancer.nlp.NlpAnnotations.POS_ANNOTATION;
 import static org.apache.stanbol.enhancer.nlp.NlpAnnotations.PHRASE_ANNOTATION;
 import static org.apache.stanbol.enhancer.nlp.utils.NlpEngineHelper.getAnalysedText;
 import static org.apache.stanbol.enhancer.nlp.utils.NlpEngineHelper.getLanguage;
 import static org.apache.stanbol.enhancer.nlp.utils.NlpEngineHelper.isLangaugeConfigured;
 
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.EnumSet;
@@ -39,7 +36,6 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Properties;
 import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.stanbol.enhancer.engines.poschunker.PhraseBuilder;
 import org.apache.stanbol.enhancer.engines.poschunker.PhraseBuilder.ChunkFactory;
@@ -51,14 +47,11 @@ import org.apache.stanbol.enhancer.nlp.m
 import org.apache.stanbol.enhancer.nlp.model.Chunk;
 import org.apache.stanbol.enhancer.nlp.model.Section;
 import org.apache.stanbol.enhancer.nlp.model.Span;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
 import org.apache.stanbol.enhancer.nlp.model.Token;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
 import org.apache.stanbol.enhancer.nlp.model.annotation.Value;
-import org.apache.stanbol.enhancer.nlp.model.tag.TagSet;
 import org.apache.stanbol.enhancer.nlp.phrase.PhraseTag;
 import org.apache.stanbol.enhancer.nlp.pos.LexicalCategory;
-import org.apache.stanbol.enhancer.nlp.pos.Pos;
-import org.apache.stanbol.enhancer.nlp.pos.PosTag;
 import org.apache.stanbol.enhancer.nlp.utils.LanguageConfiguration;
 import org.apache.stanbol.enhancer.servicesapi.ContentItem;
 import org.apache.stanbol.enhancer.servicesapi.EngineException;

Propchange: stanbol/branches/release-0.12/launchers/bundlelists/enhancer/
------------------------------------------------------------------------------
  Merged /stanbol/trunk/launchers/bundlelists/enhancer:r1556839

Modified: stanbol/branches/release-0.12/launchers/bundlelists/enhancer/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/enhancer/src/main/bundles/list.xml?rev=1557043&r1=1557042&r2=1557043&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/enhancer/src/main/bundles/list.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/enhancer/src/main/bundles/list.xml Fri Jan 10 07:27:56 2014
@@ -96,11 +96,11 @@
       <artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId>
       <version>0.11.0-SNAPSHOT</version>
     </bundle>
-    <bundle>
+    <!-- bundle> - no longer used as it does not support chains -
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
       <version>0.11.0-SNAPSHOT</version>
-    </bundle>
+    </bundle -->
   </startLevel>
   <!-- Enhancement Chain implementations -->
   <startLevel level="30">
@@ -214,6 +214,13 @@
       <artifactId>org.apache.stanbol.enhancer.engines.restful.nlp</artifactId>
       <version>0.10.1-SNAPSHOT</version>
     </bundle>
+    
+    <bundle> <!-- POS annotation based chunker (STANBOL-1251) -->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.enhancer.engines.poschunker</artifactId>
+      <version>0.10.1-SNAPSHOT</version>
+    </bundle>
+    
     <!-- NLP metadata to RDF (using NIF 1.0) - NOT YET READY FOR DEFAULT CONFIG
     <bundle>
       <groupId>org.apache.stanbol</groupId>