diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3ac23afd843b60cb890d65f8e9e3a7672e3ade2..09a6d5ae73350aea194a72652323a12abaadb4d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: openjdk:8-jdk variables: SAREF_DEV_KEY: + SAREF_PORTAL_KEY: before_script: - eval $(ssh-agent -s) @@ -68,6 +69,9 @@ trigger-release: stage: deploy only: - /^release-v/ + variables: + SAREF_DEV_KEY: $SAREF_DEV_KEY + SAREF_PORTAL_KEY: $SAREF_PORTAL_KEY trigger: project: saref/saref-portal branch: master diff --git a/README.md b/README.md index ef107c0f18670e0c2cd080eebfff2c9d164f44d9..1bd06e1e77200669f5dda31fe40e1a34429e6bf4 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ Repository for the SAREF core ontology. + \ No newline at end of file diff --git a/documentation/description.html b/documentation/description.html index c36a88ff6c046c8410403f4bcdf257f22352099b..c1d47190c1a3fac16b186332d6e6effc97158a75 100644 --- a/documentation/description.html +++ b/documentation/description.html @@ -20,7 +20,7 @@

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 saref:Device has at least one function (saref:hasFunction min 1 saref:Function). Moreover, a saref:Device can be used for (saref:isUsedFor property) the purpose of offering a commodity, such as saref:Water or saref:Gas. It can also measure a property, such as saref:Temperature, saref:Energy and saref:Smoke. Moreover, a device may consist of other devices (saref:consistsOf property).

- Types of devices + Types of devices
Figure 3: Types of devices
diff --git a/ontology/saref.ttl b/ontology/saref.ttl index 1fdf5ccf81ba417f0c9071a59b556ff59685dcff..af50fe5e73df2013bc6158997790ba8db4c90e91 100644 --- a/ontology/saref.ttl +++ b/ontology/saref.ttl @@ -48,7 +48,7 @@ - Language tags have been added to all labels and comments. """ ; 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 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).