Commit 3b8e137b authored by Marc Girod-Genet's avatar Marc Girod-Genet
Browse files

Merge branch 'fix-pipeline-1' into 'master'

Fixed blocking issues detected by the saref-pipeline.

See merge request stf/stf-566/saref4ehaw!16
parents ecbcd8d3 3521c3af
Loading
Loading
Loading
Loading

.gitignore

0 → 100644
+9 −0
Original line number Original line Diff line number Diff line
/target/
.project
.classpath
.settings
*~
saref-pipeline.jar
.DS_Store
target
catalog-v001.xml
+6 −7
Original line number Original line Diff line number Diff line
@@ -2,8 +2,8 @@ Copyright 2019 ETSI


Redistribution and use in source and binary forms, with or without 
Redistribution and use in source and binary forms, with or without 
modification, are permitted provided that the following conditions are met:
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,  this
1. Redistributions of source code must retain the above copyright notice, 
   list of conditions and the following disclaimer.
   this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice, 
2. Redistributions in binary form must reproduce the above copyright notice, 
   this list of conditions and the following disclaimer in the documentation 
   this list of conditions and the following disclaimer in the documentation 
   and/or other materials provided with the distribution.
   and/or other materials provided with the distribution.
@@ -13,12 +13,11 @@ modification, are permitted provided that the following conditions are met:


THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
DISCLAIMED. 
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THE POSSIBILITY OF SUCH DAMAGE.
 No newline at end of file
+3 −3
Original line number Original line Diff line number Diff line
@@ -27,8 +27,8 @@
                                      owl:versionInfo "v1.1.1" ;
                                      owl:versionInfo "v1.1.1" ;
                                      vann:preferredNamespacePrefix "s4ehaw" ;
                                      vann:preferredNamespacePrefix "s4ehaw" ;
                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
                                      dcterms:issued "date when the document is online"^^xsd:date ;
                                      dcterms:issued "2020-02-01"^^xsd:date ;
				      dcterms:modified "do not set this"^^xsd:date ;
				      dcterms:modified "2020-02-01"^^xsd:date ;
                                      dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
                                      dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
                                      dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
                                      dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both:
SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both:
@@ -1392,7 +1392,7 @@ s4ehaw:walking rdf:type owl:NamedIndividual ,




###  https://saref.etsi.org/saref4ehaw/Armpit
###  https://saref.etsi.org/saref4ehaw/Armpit
:Armpit rdf:type owl:NamedIndividual ,
s4ehaw:Armpit rdf:type owl:NamedIndividual ,
                 s4ehaw:BodySurfaceLocation .
                 s4ehaw:BodySurfaceLocation .