Commit e823beba authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

Merge branch 'prerelease-v1.1.1' into 'release-v1.1.1' 

Prerelease v1.1.1

See merge request !5
parents bae2d58c 3854bd2a

.gitlab-ci.yml

+24 −19
Changes for .gitlab-ci.yml: 24 added lines, 19 removed lines.
Original line number Diff line number Diff line 
image: openjdk:8-jdk



variables:

    GIT_STRATEGY: fetch

    GIT_DEPTH: 0

    SAREF_DEV_KEY: <my_private_key>

    SAREF_PORTAL_KEY: <my_private_key>



before_script:

  - eval $(ssh-agent -s)

  - ssh-add <(echo "$SAREF_DEV_KEY")

  - mkdir -p ~/.ssh

  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'



stages:

  - test

  - build

  - deploy





test-develop:

  stage: test

  image: openjdk:11-jre

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar develop -s && touch target/success

  allow_failure: true

  except:
@@ -34,8 +30,9 @@ test-develop: 


test-prerelease:

  stage: test

  image: openjdk:11-jre

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar release -t && touch target/success

  allow_failure: true

  only:
@@ -48,19 +45,27 @@ test-prerelease: 
    reports:

      junit: target/report_output.xml



deploy-report:

  stage: deploy

  script:

    - scp -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID

    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 

    - exit $(test -f target/success) $?

  except:

    - /^release-v/

# deploy-report:

#   stage: deploy

#   image: alpine:latest

#   script:

#     - apk update

#     - apk add openssh

#     - eval $(ssh-agent -s)

#     - ssh-add <(echo "$SAREF_DEV_KEY")

#     - mkdir -p ~/.ssh

#     - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'

#     - scp -P 29419 -pr target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID

#     - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 

#     - exit $(test -f target/success) $?

#   except:

#     - /^release-v/



test-release:

  stage: test

  image: openjdk:11-jre

  script:

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - curl -L -o saref-pipeline.jar "https://labs.etsi.org/rep/saref/saref-pipeline/-/releases/permalink/latest/downloads/saref-pipeline.jar"

    - java -jar saref-pipeline.jar release -t

  only:

    - /^release-v/

documentation/description.html

+2 −2
Changes for documentation/description.html: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ 


<h3>Occurrence</h3>



<p>In some cases, wearables will be able to detect occurrences (<a href="#s4wear:Occurrence">s4wear:Occurrence</a>) taking place (<a href="#s4wear:takesPlaceAt">s4wear:takesPlaceAt</a>) in a location that is relevant to the wearer (geosp:Feature). These occurrences can be related to the device detecting them through the <a href="#s4wear:isDetectedBy">s4wear:isDetectedBy</a> property, as shown in <a href="#Figure_6">Figure 6</a>.</p>

<p>In some cases, wearables will be able to detect occurrences (<a href="#s4wear:Occurrence">s4wear:Occurrence</a>) taking place (<a href="#s4wear:takesPlaceAt">s4wear:takesPlaceAt</a>) in a location that is relevant to the wearer (geo:Feature). These occurrences can be related to the device detecting them through the <a href="#s4wear:isDetectedBy">s4wear:isDetectedBy</a> property, as shown in <a href="#Figure_6">Figure 6</a>.</p>

 

<p>In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (<a href="https://saref.etsi.org/saref4city/Event">s4city:Event</a>, a subclass of <a href="#s4wear:Occurrence">s4wear:Occurrence</a>) that take place at (<a href="https://saref.etsi.org/saref4city/takesPlaceAtFacility">s4city:takesPlaceAtFacility</a>) facilities (<a href="https://saref.etsi.org/saref4city/Facility">s4city:Facility</a>, a subclass of geosp:Feature).</p> 

<p>In the context of a smart city, more specific classes can be used from SAREF4CITY, to represent events (<a href="https://saref.etsi.org/saref4city/Event">s4city:Event</a>, a subclass of <a href="#s4wear:Occurrence">s4wear:Occurrence</a>) that take place at (<a href="https://saref.etsi.org/saref4city/takesPlaceAtFacility">s4city:takesPlaceAtFacility</a>) facilities (<a href="https://saref.etsi.org/saref4city/Facility">s4city:Facility</a>, a subclass of geo:Feature).</p> 



<figure>

  <a href="diagrams/SAREF4WEAR Occurrence.png"><img src="diagrams/SAREF4WEAR Occurrence.png" alt="Occurence model"/></a>

examples/health-status-monitor.ttl

+1 −1
Changes for examples/health-status-monitor.ttl: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .

examples/indoor-event.ttl

+2 −2
Changes for examples/indoor-event.ttl: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .
@@ -82,7 +82,7 @@ ex:FacilitySpeaker1 rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4wear/example/ForumAssago

ex:ForumAssago rdf:type owl:NamedIndividual ,

                        s4city:Facility ;

               geosp:sfContains ex:SmokeSensor1 ,

               geo:sfContains ex:SmokeSensor1 ,

                                ex:SmokeSensor2 ,

                                ex:Controller1 ,

                                ex:Tracker1 ,

examples/openair-event.ttl

+2 −2
Changes for examples/openair-event.ttl: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
@prefix saref: <https://saref.etsi.org/core/> .

@prefix s4city: <https://saref.etsi.org/saref4city/> .

@prefix s4wear: <https://saref.etsi.org/saref4wear/> .

@prefix geosp: <http://www.opengis.net/ont/geosparql#>.

@prefix geo: <http://www.opengis.net/ont/geosparql#>.

@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .

@base <https://saref.etsi.org/saref4wear/example/> .
@@ -113,7 +113,7 @@ ex:Customer3 rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4wear/example/Woodstock

ex:Woodstock rdf:type owl:NamedIndividual ,

                      s4city:Facility ;

             geosp:sfContains ex:Receiver1 ,

             geo:sfContains ex:Receiver1 ,

                              ex:Tracker1 ,

                              ex:Tracker2 ,

                              ex:Tracker3 ,