svn commit: r1633605 - in /stanbol/branches/release-0.12: ./ enhancement-engines/ enhancement-engines/nlp2rdf/ enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/ enhancer/ enhancer/generic/nlp/src/main/java/or...

[rw...@apache.org]

Author: rwesten
Date: Wed Oct 22 12:36:25 2014
New Revision: 1633605

URL: http://svn.apache.org/r1633605
Log:
merged implementation of STANBOL-1397 from trunk back to 0.12.1

Added:
    stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java
      - copied, changed from r1633587, stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java
    stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java
      - copied, changed from r1633587, stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java
    stanbol/branches/release-0.12/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/nif/Nif20.java
      - copied unchanged from r1633587, stanbol/trunk/enhancer/generic/nlp/src/main/java/org/apache/stanbol/enhancer/nlp/nif/Nif20.java
Modified:
    stanbol/branches/release-0.12/   (props changed)
    stanbol/branches/release-0.12/enhancement-engines/   (props changed)
    stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/pom.xml
    stanbol/branches/release-0.12/enhancer/   (props changed)

Propchange: stanbol/branches/release-0.12/
------------------------------------------------------------------------------
  Merged /stanbol/trunk:r1633587

Propchange: stanbol/branches/release-0.12/enhancement-engines/
------------------------------------------------------------------------------
  Merged /stanbol/trunk/enhancement-engines:r1633587

Modified: stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/pom.xml?rev=1633605&r1=1633604&r2=1633605&view=diff
==============================================================================
--- stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/pom.xml (original)
+++ stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/pom.xml Wed Oct 22 12:36:25 2014
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.enhancer.nlp</artifactId>
-      <version>0.10.0</version>
+      <version>0.12.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Copied: stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java (from r1633587, stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java)
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java?p2=stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java&p1=stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java&r1=1633587&r2=1633605&rev=1633605&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java (original)
+++ stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20Helper.java Wed Oct 22 12:36:25 2014
@@ -40,12 +40,11 @@ import org.apache.stanbol.enhancer.nlp.N
 import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
 import org.apache.stanbol.enhancer.nlp.model.Chunk;
 import org.apache.stanbol.enhancer.nlp.model.Span;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
 import org.apache.stanbol.enhancer.nlp.model.Token;
 import org.apache.stanbol.enhancer.nlp.model.annotation.Annotated;
 import org.apache.stanbol.enhancer.nlp.model.annotation.Annotation;
 import org.apache.stanbol.enhancer.nlp.model.annotation.Value;
-import org.apache.stanbol.enhancer.nlp.ner.NerTag;
 import org.apache.stanbol.enhancer.nlp.nif.Nif20;
 import org.apache.stanbol.enhancer.nlp.phrase.PhraseTag;
 import org.apache.stanbol.enhancer.nlp.pos.LexicalCategory;

Copied: stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java (from r1633587, stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java)
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java?p2=stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java&p1=stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java&r1=1633587&r2=1633605&rev=1633605&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java (original)
+++ stanbol/branches/release-0.12/enhancement-engines/nlp2rdf/src/main/java/org/apache/stanbol/enhancer/engines/nlp2rdf/engine/Nif20MetadataEngine.java Wed Oct 22 12:36:25 2014
@@ -38,7 +38,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.stanbol.enhancer.nlp.NlpAnnotations;
 import org.apache.stanbol.enhancer.nlp.model.AnalysedText;
 import org.apache.stanbol.enhancer.nlp.model.Span;
-import org.apache.stanbol.enhancer.nlp.model.SpanTypeEnum;
+import org.apache.stanbol.enhancer.nlp.model.Span.SpanTypeEnum;
 import org.apache.stanbol.enhancer.nlp.model.annotation.Value;
 import org.apache.stanbol.enhancer.nlp.nif.Nif20;
 import org.apache.stanbol.enhancer.servicesapi.ContentItem;

Propchange: stanbol/branches/release-0.12/enhancer/
------------------------------------------------------------------------------
  Merged /stanbol/trunk/enhancer:r1633587