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

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

Prerelease v3.1.1

See merge request SAREF/saref-core!38
parents 3850ad6b 38dcb25f
Loading
Loading
Loading
Loading
+8 −4
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ image: openjdk:8-jdk


variables:
variables:
    SAREF_DEV_KEY: <my_private_key>
    SAREF_DEV_KEY: <my_private_key>
    SAREF_PORTAL_KEY: <my_private_key>


before_script:
before_script:
  - eval $(ssh-agent -s)
  - eval $(ssh-agent -s)
@@ -17,7 +18,7 @@ stages:
test-develop:
test-develop:
  stage: test
  stage: test
  script:
  script:
    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - curl -L -o saref-pipeline.jar "https://forge.etsi.org/rep/SAREF/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - java -jar saref-pipeline.jar develop -s && touch target/success
    - java -jar saref-pipeline.jar develop -s && touch target/success
  allow_failure: true
  allow_failure: true
  except:
  except:
@@ -34,7 +35,7 @@ test-develop:
test-prerelease:
test-prerelease:
  stage: test
  stage: test
  script:
  script:
    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - curl -L -o saref-pipeline.jar "https://forge.etsi.org/rep/SAREF/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - java -jar saref-pipeline.jar release -t && touch target/success
    - java -jar saref-pipeline.jar release -t && touch target/success
  allow_failure: true
  allow_failure: true
  only:
  only:
@@ -50,7 +51,7 @@ test-prerelease:
deploy-report:
deploy-report:
  stage: deploy
  stage: deploy
  script:
  script:
    - scp -pr '-P 29419' target/site saref-dev@saref.etsi.org:~/snapshot/$CI_PIPELINE_ID
    - 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" 
    - echo "SAREF pipeline report  https://saref.etsi.org/snapshot/$CI_PIPELINE_ID/report.html" 
    - exit $(test -f target/success) $?
    - exit $(test -f target/success) $?
  except:
  except:
@@ -59,7 +60,7 @@ deploy-report:
test-release:
test-release:
  stage: test
  stage: test
  script:
  script:
    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - curl -L -o saref-pipeline.jar "https://forge.etsi.org/rep/SAREF/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"
    - java -jar saref-pipeline.jar release -t
    - java -jar saref-pipeline.jar release -t
  only:
  only:
    - /^release-v/
    - /^release-v/
@@ -68,6 +69,9 @@ trigger-release:
  stage: deploy
  stage: deploy
  only:
  only:
    - /^release-v/
    - /^release-v/
  variables:
    SAREF_DEV_KEY: $SAREF_DEV_KEY
    SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY
  trigger:
  trigger:
    project: saref/saref-portal
    project: saref/saref-portal
    branch: master
    branch: master
+1 −0
Original line number Original line Diff line number Diff line
Repository for the SAREF core ontology.
Repository for the SAREF core ontology.
 
 No newline at end of file
+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@
<p>SAREF is conceived in a modular way in order to allow the definition of any device from pre-defined building blocks, based on the function(s) that the device performs. Therefore, a <a href="#saref:Device">saref:Device</a> has at least one function (<a href="#saref:hasFunction">saref:hasFunction</a> min 1 <a href="#saref:Function">saref:Function</a>). Moreover, a <a href="#saref:Device">saref:Device</a> can be used for (<a href="#saref:isUsedFor">saref:isUsedFor</a> property) the purpose of offering a commodity, such as <a href="#saref:Water">saref:Water</a> or <a href="#saref:Gas">saref:Gas</a>. It can also measure a property, such as <a href="#saref:Temperature">saref:Temperature</a>, <a href="#saref:Energy">saref:Energy</a> and <a href="#saref:Smoke">saref:Smoke</a>. Moreover, a device may consist of other devices (<a href="#saref:consistsOf">saref:consistsOf</a> property).</p>
<p>SAREF is conceived in a modular way in order to allow the definition of any device from pre-defined building blocks, based on the function(s) that the device performs. Therefore, a <a href="#saref:Device">saref:Device</a> has at least one function (<a href="#saref:hasFunction">saref:hasFunction</a> min 1 <a href="#saref:Function">saref:Function</a>). Moreover, a <a href="#saref:Device">saref:Device</a> can be used for (<a href="#saref:isUsedFor">saref:isUsedFor</a> property) the purpose of offering a commodity, such as <a href="#saref:Water">saref:Water</a> or <a href="#saref:Gas">saref:Gas</a>. It can also measure a property, such as <a href="#saref:Temperature">saref:Temperature</a>, <a href="#saref:Energy">saref:Energy</a> and <a href="#saref:Smoke">saref:Smoke</a>. Moreover, a device may consist of other devices (<a href="#saref:consistsOf">saref:consistsOf</a> property).</p>


<figure>
<figure>
  <img src="diagrams/Device.png" alt="Types of devices"/>
  <img src="diagrams/DeviceTypes.png" alt="Types of devices"/>
  <figcaption id="Figure_3">Figure 3: Types of devices</figcaption>
  <figcaption id="Figure_3">Figure 3: Types of devices</figcaption>
</figure>
</figure>


+1 −1
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@
 - Language tags have been added to all labels and comments.
 - Language tags have been added to all labels and comments.
""" ;
""" ;
                          rdfs:comment """Information about changes compared to version 1.1.1:
                          rdfs:comment """Information about changes compared to version 1.1.1:
 - The classes and properties related to how to represent devices in building spaces (such as the saref:BuildingSpace class,  saref:BuildingObject class and saref:isLocatedIn property) have been removed from SAREF and incorporated  into the SAREF4BLDG extension related to buildings, including the reuse of the W3C¨ WGS84 geo positioning vocabulary.
 - The classes and properties related to how to represent devices in building spaces (such as the saref:BuildingSpace class,  saref:BuildingObject class and saref:isLocatedIn property) have been removed from SAREF and incorporated  into the SAREF4BLDG extension related to buildings, including the reuse of the W3C? WGS84 geo positioning vocabulary.
 - The saref:DeviceCategory and saref:FunctionCategory classes have been removed. Instead, the hierarchy of device categories has been implemented directly as subclasses of the saref:Device class.
 - The saref:DeviceCategory and saref:FunctionCategory classes have been removed. Instead, the hierarchy of device categories has been implemented directly as subclasses of the saref:Device class.
 - The information specific for energy efficiency has been moved to the SAREF4ENER extension. For example, the saref:Profile class has been redefined to accommodate only the properties that are general enough for any type of profile, not only for energy and power. Details on how to specifically model a power profile can be found in the SAREF4ENER extension. 
 - The information specific for energy efficiency has been moved to the SAREF4ENER extension. For example, the saref:Profile class has been redefined to accommodate only the properties that are general enough for any type of profile, not only for energy and power. Details on how to specifically model a power profile can be found in the SAREF4ENER extension. 
 - The subclasses of the saref:Energy class  have been removed (i.e., Average Energy, Maximum Energy, Minimum Energy, Total Energy, HVAC Energy, Hot Water Energy and Lighting Energy).
 - The subclasses of the saref:Energy class  have been removed (i.e., Average Energy, Maximum Energy, Minimum Energy, Total Energy, HVAC Energy, Hot Water Energy and Lighting Energy).