Merge branch 'release/3.0.1'

README.md

@@ -63,7 +63,7 @@ mvn clean verify -P all-tests
 # Usage
 
 ```
-usage: java -jar stanfordNLPRESTAPI-3.0.0.jar
+usage: java -jar stanfordNLPRESTAPI-3.0.1.jar
        [-h] [-v] {server,check,pos,ner} ...
 
 positional arguments:
@@ -87,7 +87,7 @@ The first way is via CLI with two possible sub-commands, **ner** and **pos**.
 To use the **ner** CLI:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-3.0.0.jar
+usage: java -jar stanfordNLPRESTAPI-3.0.1.jar
        ner [-f {turtle,jsonld}] [-s {neel2015,neel2016,oke2015,oke2016,none}] [-o OFILE] [-l {en,es,de,zh,it}] [-h] (-t TEXT | -i IFILE | -u URL) [file]
 
 NER command on text
@@ -102,7 +102,7 @@ optional arguments:
                          neel2015, neel2016, oke2015, oke2016 or none (default: none)
   -o OFILE, --output-file OFILE
                          Output file name which will contain the annotations
-  -l {en,es,de,zh,it}, --language {en,es,de,zh,it}
+  -l {en,es,de,zh,it,fr}, --language {en,es,de,zh,it,fr}
                          Select the language (default: en)
   -h, --help             show this help message and exit
 
@@ -118,7 +118,7 @@ inputs:
 To use the **pos** CLI:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-3.0.0.jar
+usage: java -jar stanfordNLPRESTAPI-3.0.1.jar
        pos [-f {turtle,jsonld}] [-s {none,tweet}] [-o OFILE] [-l {en,es,de,zh,fr,it}] [-h] (-t TEXT | -i IFILE | -u URL) [file]
 
 POS command on text
@@ -149,7 +149,7 @@ inputs:
 The second way is via a Web service:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-3.0.0.jar
+usage: java -jar stanfordNLPRESTAPI-3.0.1.jar
        server [-h] [file]
 
 Runs the Dropwizard application as an HTTP server
@@ -178,7 +178,7 @@ mvn docker:build
 Once the image is built, it is possible to run it with:
 
 ```
-docker run -d -p 7000:7000 -p 7001:7001 -v $PWD/models:/maven/models -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:3.0.0
+docker run -d -p 7000:7000 -p 7001:7001 -v $PWD/models:/maven/models -v $PWD/properties:/maven/properties -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:3.0.1
 ```
 
 Or with:
@@ -206,6 +206,7 @@ download the jar files provided by Stanford with models for other languages. To
 * NEEL2015 [3][4]: NER model for tweets trained with the NEEL2015 challenge training dataset.
 * NEEL2016 [3][4][5]: NER model for tweets trained with the NEEL2016 challenge training dataset.
 * gate-EN-twitter [6]: POS tagger model for tagging tweets.
+* ETAPE [8]: NER model trained with the ETAPE challenge training dataset. 
 
 # How to contribute
 
@@ -242,8 +243,9 @@ All the content of this repository is licensed under the terms of the GPL v3 lic
 
 * [1]: Plu J., Rizzo G., Troncy R. (2015) A Hybrid Approach for Entity Recognition and Linking. In: 12th European Semantic Web Conference (ESWC'15), Open Extraction Challenge, Portoroz, Slovenia.
 * [2]: Plu J., Rizzo G., Troncy R. (2016) Enhancing Entity Linking by Combining NER Models. In: 13th Extended Semantic Web Conference (ESWC'16), Challenges Track, Heraklion, Greece.
-* [3]: Cano A.E., Rizzo G., Varga A., Rowe M., Stankovic M., Dadzie A.S. (2014), Making Sense of Microposts (#Microposts2014) Named Entity Extraction & Linking Challenge. In (WWW'14),4th International Workshop on Making Sense of Microposts (#Microposts'14), Seoul, Korea.
-* [4]: Rizzo G., Cano A.E., Pereira B., Varga A. (2015), Making Sense of Microposts (#Microposts2015) Named Entity rEcognition & Linking Challenge. In (WWW'15), 5th International Workshop on Making Sense of Microposts (#Microposts'15), Florence, Italy.
-* [5]: Rizzo G., van Erp M., Plu J., Troncy R. (2015), NEEL 2016: Named Entity rEcognition & Linking Challenge Report. In (WWW'16), 6th International Workshop on Making Sense of Microposts (#Microposts'16), Montréal, Québec, Canada.
-* [6]: Derczynski L., Ritter A., Clark S., Bontcheva K. (2013), Twitter Part-of-Speech Tagging for All: Overcoming Sparse and Noisy Data. In: Association for Computational Linguistics (ACL'13), Sofia, Bulgaria
-* [7]: Palmero Aprosio A., Moretti, G. (2016), Italy goes to Stanford: a collection of CoreNLP modules for Italian.
+* [3]: Cano A.E., Rizzo G., Varga A., Rowe M., Stankovic M., Dadzie A.S. (2014) Making Sense of Microposts (#Microposts2014) Named Entity Extraction & Linking Challenge. In (WWW'14),4th International Workshop on Making Sense of Microposts (#Microposts'14), Seoul, Korea.
+* [4]: Rizzo G., Cano A.E., Pereira B., Varga A. (2015) Making Sense of Microposts (#Microposts2015) Named Entity rEcognition & Linking Challenge. In (WWW'15), 5th International Workshop on Making Sense of Microposts (#Microposts'15), Florence, Italy.
+* [5]: Rizzo G., van Erp M., Plu J., Troncy R. (2015) NEEL 2016: Named Entity rEcognition & Linking Challenge Report. In (WWW'16), 6th International Workshop on Making Sense of Microposts (#Microposts'16), Montréal, Québec, Canada.
+* [6]: Derczynski L., Ritter A., Clark S., Bontcheva K. (2013) Twitter Part-of-Speech Tagging for All: Overcoming Sparse and Noisy Data. In: Association for Computational Linguistics (ACL'13), Sofia, Bulgaria
+* [7]: Palmero Aprosio A., Moretti, G. (2016) Italy goes to Stanford: a collection of CoreNLP modules for Italian.
+* [8]: Gravier G., Adda G.,Paulsson N., Carré M.,Giraudel A.,Galibert O. (2012) The ETAPE corpus for the evaluation of speech-based TV content processing in the French language.

checkstyle-suppressions.xml

@@ -2,7 +2,7 @@
 <!--
 
     StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-    Copyright © 2016 Julien Plu ([email protected])
+    Copyright © 2017 Julien Plu ([email protected])
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

checkstyle.xml

@@ -2,7 +2,7 @@
 <!--
 
     StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-    Copyright © 2016 Julien Plu ([email protected])
+    Copyright © 2017 Julien Plu ([email protected])
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

conf/config.yaml

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

exclude-pmd.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

pom.xml

@@ -2,7 +2,7 @@
 <!--
 
     StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-    Copyright © 2016 Julien Plu ([email protected])
+    Copyright © 2017 Julien Plu ([email protected])
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
     <groupId>fr.eurecom</groupId>
     <artifactId>stanfordNLPRESTAPI</artifactId>
     <name>StanfordNLPRESTAPI</name>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -395,13 +395,13 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>3.0.rc1</version>
+                <version>3.0</version>
                 <configuration>
                     <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
                     <properties>
                         <owner>Julien Plu</owner>
                         <email>[email protected]</email>
-                        <project.inceptionYear>2016</project.inceptionYear>
+                        <project.inceptionYear>2017</project.inceptionYear>
                         <project.description>
         Offering a REST API over Stanford CoreNLP to get results in NIF format.
                         </project.description>
@@ -495,6 +495,7 @@
                                 <volumes>
                                     <volume>/maven/conf</volume>
                                     <volume>/maven/models</volume>
+                                    <volume>/maven/properties</volume>
                                 </volumes>
                                 <workdir>/maven</workdir>
                                 <cmd>
@@ -510,6 +511,7 @@
                                     <bind>
                                         <volume>${project.basedir}/conf:/maven/conf</volume>
                                         <volume>${project.basedir}/models:/maven/models</volume>
+                                        <volume>${project.basedir}/properties:/maven/properties</volume>
                                     </bind>
                                 </volumes>
                                 <wait>
@@ -683,7 +685,7 @@
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
-            <version>1.10.1</version>
+            <version>1.10.2</version>
         </dependency>
         <dependency>
             <groupId>eu.fbk.dh</groupId>

properties/de.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

properties/en.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

properties/es.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

properties/fr.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +16,10 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 
-annotators=tokenize, ssplit, pos, parse
+annotators=tokenize, ssplit, pos, ner, parse
 tokenize.language=fr
 pos.model=edu/stanford/nlp/models/pos-tagger/french/french.tagger
-parse.model=edu/stanford/nlp/models/lexparser/frenchFactored.ser.gz
+ner.model=models/etape.ser.gz
+ner.applyNumericClassifiers=false
+ner.useSUTime=false
+parse.model=edu/stanford/nlp/models/lexparser/frenchFactored.ser.gz

properties/it.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

properties/zh.properties

@@ -1,6 +1,6 @@
 #
 # StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-# Copyright © 2016 Julien Plu ([email protected])
+# Copyright © 2017 Julien Plu ([email protected])
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/main/docker/docker-assembly.xml

@@ -1,7 +1,7 @@
 <!--
 
     StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
-    Copyright © 2016 Julien Plu ([email protected])
+    Copyright © 2017 Julien Plu ([email protected])
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/App.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/cli/NerCommand.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ public final void configure(final Subparser subparser) {
         .type(String.class)
         .required(false)
         .setDefault("en")
-        .choices("en", "es", "de", "zh", "it")
+        .choices("en", "es", "de", "zh", "it", "fr")
         .help("Select the language");
   }
 

src/main/java/fr/eurecom/stanfordnlprestapi/cli/PosCommand.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/cli/UrlAction.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/cli/package-info.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/configurations/PipelineConfiguration.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/configurations/package-info.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/core/StanfordNlp.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/core/package-info.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/Context.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/Entity.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/Languages.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/SentenceImpl.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/TokenImpl.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/datatypes/package-info.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/enums/NlpProcess.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/fr/eurecom/stanfordnlprestapi/enums/package-info.java

@@ -1,6 +1,6 @@
 /**
  * StanfordNLPRESTAPI - Offering a REST API over Stanford CoreNLP to get results in NIF format.
- * Copyright © 2016 Julien Plu ([email protected])
+ * Copyright © 2017 Julien Plu ([email protected])
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by