Revision b20c081f
Added by Andreas Kohlbecker over 8 years ago
pom.xml | ||
---|---|---|
2 | 2 |
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> |
3 | 3 |
<modelVersion>4.0.0</modelVersion> |
4 | 4 |
<groupId>eu.etaxonomy.utis</groupId> |
5 |
<artifactId>eubon-utis</artifactId>
|
|
5 |
<artifactId>utis-webapp</artifactId>
|
|
6 | 6 |
<packaging>war</packaging> |
7 | 7 |
|
8 | 8 |
<version>1.0-SNAPSHOT</version> |
9 |
<name>eubon-utis Maven Webapp</name>
|
|
9 |
<name>UTIS web application</name>
|
|
10 | 10 |
<url>http://maven.apache.org</url> |
11 | 11 |
|
12 | 12 |
<properties> |
13 | 13 |
<spring.version>3.2.7.RELEASE</spring.version> |
14 | 14 |
<jackson.version>2.2.3</jackson.version> |
15 | 15 |
<java.codelevel>1.6</java.codelevel> |
16 |
<utis-core.version>1.1.0-SNAPSHOT</utis-core.version> |
|
16 | 17 |
</properties> |
17 | 18 |
|
18 | 19 |
<repositories> |
... | ... | |
91 | 92 |
<scope>test</scope> |
92 | 93 |
</dependency> |
93 | 94 |
<dependency> |
94 |
<groupId>biovel.drf</groupId>
|
|
95 |
<artifactId>drf-workflow</artifactId>
|
|
96 |
<version>1.0.6-SNAPSHOT</version>
|
|
95 |
<groupId>org.cybertaxonomy</groupId>
|
|
96 |
<artifactId>utis-core</artifactId>
|
|
97 |
<version>${utis-core.version}</version>
|
|
97 | 98 |
</dependency> |
98 | 99 |
<dependency> |
99 | 100 |
<groupId>com.mangofactory</groupId> |
src/main/java/org/bgbm/utis/configuration/SpringMVCConfig.java | ||
---|---|---|
17 | 17 |
|
18 | 18 |
import org.apache.logging.log4j.LogManager; |
19 | 19 |
import org.apache.logging.log4j.Logger; |
20 |
import org.bgbm.biovel.drf.tnr.msg.Classification; |
|
21 |
import org.bgbm.biovel.drf.tnr.msg.TnrMsg; |
|
22 | 20 |
import org.bgbm.utis.jackson.ClassificationMixIn; |
21 |
import org.cybertaxonomy.utis.tnr.msg.Classification; |
|
22 |
import org.cybertaxonomy.utis.tnr.msg.TnrMsg; |
|
23 | 23 |
import org.springframework.beans.factory.annotation.Autowired; |
24 | 24 |
import org.springframework.context.annotation.Bean; |
25 | 25 |
import org.springframework.context.annotation.ComponentScan; |
src/main/java/org/bgbm/utis/controller/ChecklistClientRunner.java | ||
---|---|---|
1 | 1 |
package org.bgbm.utis.controller; |
2 | 2 |
|
3 |
import org.bgbm.biovel.drf.checklist.BaseChecklistClient; |
|
4 |
import org.bgbm.biovel.drf.checklist.DRFChecklistException; |
|
5 |
import org.bgbm.biovel.drf.checklist.SearchMode; |
|
6 |
import org.bgbm.biovel.drf.checklist.UnsupportedIdentifierException; |
|
7 |
import org.bgbm.biovel.drf.tnr.msg.TnrMsg; |
|
8 |
import org.bgbm.biovel.drf.tnr.msg.Response; |
|
9 |
import org.bgbm.biovel.drf.utils.TnrMsgUtils; |
|
3 |
import org.cybertaxonomy.utis.checklist.BaseChecklistClient; |
|
4 |
import org.cybertaxonomy.utis.checklist.DRFChecklistException; |
|
5 |
import org.cybertaxonomy.utis.checklist.UnsupportedIdentifierException; |
|
6 |
import org.cybertaxonomy.utis.tnr.msg.TnrMsg; |
|
7 |
import org.cybertaxonomy.utis.utils.TnrMsgUtils; |
|
10 | 8 |
import org.slf4j.Logger; |
11 | 9 |
import org.slf4j.LoggerFactory; |
12 | 10 |
|
... | ... | |
14 | 12 |
|
15 | 13 |
protected Logger logger = LoggerFactory.getLogger(ChecklistClientRunner.class); |
16 | 14 |
|
17 |
private BaseChecklistClient client; |
|
15 |
private final BaseChecklistClient client;
|
|
18 | 16 |
|
19 |
private TnrMsg tnrMsg; |
|
17 |
private final TnrMsg tnrMsg;
|
|
20 | 18 |
|
21 | 19 |
private long duration; |
22 | 20 |
|
src/main/java/org/bgbm/utis/controller/UtisController.java | ||
---|---|---|
24 | 24 |
import javax.servlet.http.HttpServletRequest; |
25 | 25 |
import javax.servlet.http.HttpServletResponse; |
26 | 26 |
|
27 |
import org.bgbm.biovel.drf.checklist.BaseChecklistClient;
|
|
28 |
import org.bgbm.biovel.drf.checklist.BgbmEditClient;
|
|
29 |
import org.bgbm.biovel.drf.checklist.DRFChecklistException;
|
|
30 |
import org.bgbm.biovel.drf.checklist.PESIClient;
|
|
31 |
import org.bgbm.biovel.drf.checklist.SearchMode;
|
|
32 |
import org.bgbm.biovel.drf.checklist.WoRMSClient;
|
|
33 |
import org.bgbm.biovel.drf.rest.ServiceProviderInfo;
|
|
34 |
import org.bgbm.biovel.drf.rest.TaxoRESTClient;
|
|
35 |
import org.bgbm.biovel.drf.tnr.msg.Query;
|
|
36 |
import org.bgbm.biovel.drf.tnr.msg.Query.ClientStatus;
|
|
37 |
import org.bgbm.biovel.drf.tnr.msg.TnrMsg;
|
|
38 |
import org.bgbm.biovel.drf.tnr.msg.Response;
|
|
39 |
import org.bgbm.biovel.drf.utils.TnrMsgUtils;
|
|
27 |
import org.cybertaxonomy.utis.checklist.BaseChecklistClient;
|
|
28 |
import org.cybertaxonomy.utis.checklist.BgbmEditClient;
|
|
29 |
import org.cybertaxonomy.utis.checklist.DRFChecklistException;
|
|
30 |
import org.cybertaxonomy.utis.checklist.PESIClient;
|
|
31 |
import org.cybertaxonomy.utis.checklist.SearchMode;
|
|
32 |
import org.cybertaxonomy.utis.checklist.WoRMSClient;
|
|
33 |
import org.cybertaxonomy.utis.client.AbstractClient;
|
|
34 |
import org.cybertaxonomy.utis.client.ServiceProviderInfo;
|
|
35 |
import org.cybertaxonomy.utis.tnr.msg.Query;
|
|
36 |
import org.cybertaxonomy.utis.tnr.msg.Query.ClientStatus;
|
|
37 |
import org.cybertaxonomy.utis.tnr.msg.Response;
|
|
38 |
import org.cybertaxonomy.utis.tnr.msg.TnrMsg;
|
|
39 |
import org.cybertaxonomy.utis.utils.TnrMsgUtils;
|
|
40 | 40 |
import org.slf4j.Logger; |
41 | 41 |
import org.slf4j.LoggerFactory; |
42 | 42 |
import org.springframework.beans.factory.config.BeanDefinition; |
... | ... | |
75 | 75 |
} |
76 | 76 |
|
77 | 77 |
|
78 |
public static <T extends TaxoRESTClient> Set<Class<T>> subclassesFor(Class<T> clazz) throws ClassNotFoundException{
|
|
78 |
public static <T extends AbstractClient> Set<Class<T>> subclassesFor(Class<T> clazz) throws ClassNotFoundException{
|
|
79 | 79 |
|
80 | 80 |
Set<Class<T>> subClasses = new HashSet<Class<T>>(); |
81 | 81 |
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true); |
82 | 82 |
provider.addIncludeFilter(new AssignableTypeFilter(clazz)); |
83 | 83 |
|
84 |
// scan only in org.bgbm.biovel.drf
|
|
84 |
// scan only in org.cybertaxonomy.utis
|
|
85 | 85 |
Set<BeanDefinition> components = provider.findCandidateComponents("org/bgbm/biovel/drf"); |
86 | 86 |
for (BeanDefinition component : components) |
87 | 87 |
{ |
src/main/java/org/bgbm/utis/jackson/ClassificationMixIn.java | ||
---|---|---|
3 | 3 |
*/ |
4 | 4 |
package org.bgbm.utis.jackson; |
5 | 5 |
|
6 |
import org.bgbm.biovel.drf.tnr.msg.Classification;
|
|
6 |
import org.cybertaxonomy.utis.tnr.msg.Classification;
|
|
7 | 7 |
|
8 | 8 |
import com.fasterxml.jackson.annotation.JsonProperty; |
9 | 9 |
|
src/main/webapp/index.html | ||
---|---|---|
37 | 37 |
of the various checklists. |
38 | 38 |
</p> |
39 | 39 |
<p> |
40 |
The current implementation of the UTIS is still a prototype, which means that the API and data model may be |
|
41 |
changed until final release. It connects the web services of the |
|
42 |
<a href="http://www.eu-nomen.eu">Pan-European Species directories Infrastructure, PESI</a> CoL, |
|
43 |
the <a href="http://www.catalogueoflife.org/">Catalogue of Life</a> and of the |
|
44 |
<a href="http://www.marinespecies.org/">World Register of Marine Species (WoRMS)</a>. |
|
45 |
In future it will connect more |
|
46 |
data providers like <a href="http://www.eea.europa.eu/themes/biodiversity/eunis/eunis-db">EUNIS</a> |
|
47 |
and <a href="http://www.eea.europa.eu/data-and-maps/data/natura-5">Natura2000</a> in order to be compliant |
|
48 |
with the <a href="http://inspire.ec.europa.eu/documents/Data_Specifications/INSPIRE_DataSpecification_SD_v3.0rc3.pdf">INSPIRE directive</a>. |
|
49 |
Currently it is possible to <strong>search for taxa and synonyms by a scientific name or |
|
50 |
vernacular name string</strong>. In case of matching synonyms the according accepted taxon is resolved. |
|
51 |
The search results always include information on the classification and optionally on related taxa as far as |
|
52 |
this data is delivered by the connected checklist providers. |
|
40 |
UTIS connects the web services of the <a href="http://www.eu-nomen.eu">Pan-European Species directories |
|
41 |
Infrastructure (EU-Nomen)</a>, <a href="http://www.eea.europa.eu/themes/biodiversity/eunis/eunis-db">EUNIS</a> which |
|
42 |
fully covers <a href="http://www.eea.europa.eu/data-and-maps/data/natura-5">Natura 2000</a>. Therefore UTIS can be used in full compliance |
|
43 |
to Appendix 3 of the <a href="http://inspire.ec.europa.eu/documents/Data_Specifications/INSPIRE_DataSpecification_SD_v3.0rc3.pdf">the |
|
44 |
INSPIRE directive</a>. Furthermore it connects to the <a href="http://www.catalogueoflife.org/">Catalogue of Life (CoL)</a>, |
|
45 |
the <a href="http://www.marinespecies.org/">World Register of Marine Species (WoRMS)</a>. |
|
46 |
</p> |
|
47 |
<p> |
|
48 |
Currently it is possible to search for taxa and synonyms by scientific name or vernacular name strings. |
|
49 |
In case of the search string matches a synonym the according accepted taxon is resolved. UTIS provides furthermore a special |
|
50 |
search mode for resolving taxon identifiers. </br> |
|
51 |
The responses of the search web service always include information |
|
52 |
on the classification and optionally on related taxa as far as this data is |
|
53 |
delivered by the connected checklist providers. |
|
53 | 54 |
</p> |
54 | 55 |
<p> |
55 | 56 |
<a href="doc.html">Documentation of the RESTful UTIS service api.</a> |
56 | 57 |
</p> |
57 |
|
|
58 |
<p><div>The service is being developed by the <a href="http://www.bgbm.org/de/wissenschaft-biodiversitaetsinformatik">Department of Research and Biodiversity Informatics</a> of the Botanic Garden and Botanical Museum Berlin-Dahlem.</div></p> |
|
58 |
<p> |
|
59 |
This first official release (v1.0) of UTIS is stabilized regarding the API and data model. Further changes are not yet planned. |
|
60 |
</p> |
|
61 |
<p><div>The service is being developed by the <a href="http://www.bgbm.org/de/wissenschaft-biodiversitaetsinformatik">Department |
|
62 |
of Research and Biodiversity Informatics</a> of the Botanic Garden and Botanical Museum Berlin-Dahlem.</div></p> |
|
59 | 63 |
</div> |
60 | 64 |
<div id="footer"> |
61 | 65 |
<a href="http://eubon.eu/" title=""><img src="images/eubon-logo.jpeg" alt="EU BON Logo"></a> |
src/test/resources/log4j2.xml | ||
---|---|---|
23 | 23 |
<!-- <Logger name="com.mangofactory.swagger" level="debug"/> --> |
24 | 24 |
<Logger name="org.bgbm.utis" level="debug"/> |
25 | 25 |
<Logger name="org.bgbm.biovel.drf" level="debug"/> |
26 |
<Logger name=org.apache.http.impl.conn" level="warn" /> |
|
27 |
<Logger name=org.apache.http.impl.conn.Wire" level="warn" /> |
|
26 | 28 |
<!-- <Logger name="org.springframework.web.servlet.view" level="debug"/> --> |
27 | 29 |
<Root level="info"> |
28 | 30 |
<AppenderRef ref="STDOUT"/> |
Also available in: Unified diff
adapting to changes in the project name and structure in drf-workflow which is now utis-core