From cf34629e4efac8b383cf5dfbb67b7857eaaea3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Sat, 13 Jun 2020 22:46:06 +0200 Subject: [PATCH 1/4] test --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ef107c0..1bd06e1 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ Repository for the SAREF core ontology. + \ No newline at end of file -- GitLab From 0b5a56b0c001aa68d0fc56e98bce285b011c0e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Sat, 13 Jun 2020 22:53:11 +0200 Subject: [PATCH 2/4] passing variables --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3ac23a..09a6d5a 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 -- GitLab From d6f2e4ea82273afb028e7a34dd961895e94f8b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Thu, 2 Jul 2020 10:12:45 +0200 Subject: [PATCH 3/4] solved #45 --- documentation/description.html | 2 +- ontology/saref.ttl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/description.html b/documentation/description.html index c36a88f..c1d4719 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 1fdf5cc..af50fe5 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). -- GitLab From 3a947c1bde632e514f50561adc2097d91c90d2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Fri, 24 Jul 2020 17:04:11 +0200 Subject: [PATCH 4/4] removed port --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09a6d5a..0281e9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ stages: test-develop: stage: test 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 allow_failure: true except: @@ -35,7 +35,7 @@ test-develop: test-prerelease: stage: test 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 allow_failure: true only: @@ -51,7 +51,7 @@ test-prerelease: deploy-report: stage: deploy 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" - exit $(test -f target/success) $? except: @@ -60,7 +60,7 @@ deploy-report: test-release: stage: test 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 only: - /^release-v/ -- GitLab