Commit 16584b42 authored by Raul Garcia-Castro's avatar Raul Garcia-Castro
Browse files

Merge branch 'old-master' into 'develop-v1.1.1' 

Old master

See merge request stf/stf-566/saref4watr!4
parents d987f907 8a547b63

.gitlab-ci.yml

0 → 100644
+31 −0
Original line number Original line Diff line number Diff line 
image: openjdk:8-jdk



develop:

  script:

    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - java -jar saref-pipeline.jar develop -s

  except:

    - /^prerelease-v/

    - /^release-v/

  artifacts:

    when: always

    paths:

      - target/site

      - target/report_output.xml

    reports:

      junit: target/report_output.xml



release:

  script:

    - curl -L -o saref-pipeline.jar "https://gitlab.emse.fr/saref/saref-pipeline/-/jobs/artifacts/master/raw/target/saref-pipeline.jar?job=build"

    - java -jar saref-pipeline.jar release

  only: 

    - /^prerelease-v/

    - /^release-v/

  artifacts:

    when: always

    paths:

      - target/site

      - target/report_output.xml

    reports:

      junit: target/report_output.xml

examples/KPI example.ttl→examples/KPI.ttl

+11 −2
Original line number Original line Diff line number Diff line 
@prefix : <https://saref.etsi.org/saref4watr/example/> .

@prefix : <https://saref.etsi.org/saref4watr/example/> .

@prefix ex: <https://saref.etsi.org/saref4watr/example/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/KPI/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -11,7 +11,16 @@ 
@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

@prefix dbpedia: <http://es.dbpedia.org/resource/> .

@prefix dbpedia: <http://es.dbpedia.org/resource/> .

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

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

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



<https://saref.etsi.org/saref4watr/v1.1.1/example/KPI#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;

  dcterms:title "Example KPI"@en ;

  dcterms:description "Example KPI"@en .









#################################################################

#################################################################

#    Object Properties

#    Object Properties

examples/Meter measurement example.ttl→examples/MeterMeasurement.ttl

+14 −3
Original line number Original line Diff line number Diff line 
@prefix : <https://saref.etsi.org/saref4watr/example/> .

@prefix ex: <https://saref.etsi.org/saref4watr/example/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/MeterMeasurement/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix time: <http://www.w3.org/2006/time#> .

@prefix time: <http://www.w3.org/2006/time#> .

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

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

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

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

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

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

@prefix dbpedia: <http://es.dbpedia.org/resource/> .

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

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



<https://saref.etsi.org/saref4watr/v1.1.1/example/MeterMeasurement#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;

  dcterms:title "Example MeterMeasurement"@en ;

  dcterms:description "Example MeterMeasurement"@en .







#################################################################

#################################################################

#    Object Properties

#    Object Properties

examples/Tariff example.ttl→examples/Tariff.ttl

+14 −3
Original line number Original line Diff line number Diff line 
@prefix : <https://saref.etsi.org/saref4watr/example/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/Tariff/> .

@prefix ex: <https://saref.etsi.org/saref4watr/example/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix time: <http://www.w3.org/2006/time#> .

@prefix time: <http://www.w3.org/2006/time#> .

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

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

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

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

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

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

@prefix dbpedia: <http://es.dbpedia.org/resource/> .

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

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



<https://saref.etsi.org/saref4watr/v1.1.1/example/Tariff#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;

  dcterms:title "Example Tariff"@en ;

  dcterms:description "Example Tariff"@en .







#################################################################

#################################################################

#    Object Properties

#    Object Properties

examples/Water infrastructure example.ttl→examples/WaterInfrastructure.ttl

+11 −3
Original line number Original line Diff line number Diff line 
@prefix : <https://saref.etsi.org/saref4watr/example/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v1.1.1/example/WaterInfrastructure/> .

@prefix ex: <https://saref.etsi.org/saref4watr/example/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

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

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

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

@prefix time: <http://www.w3.org/2006/time#> .

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

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

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

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

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4syst: <https://saref.etsi.org/saref4syst/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

@prefix s4watr: <https://saref.etsi.org/saref4watr/> .

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

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

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



<https://saref.etsi.org/saref4watr/v1.1.1/example/WaterInfrastructure#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v1.1.1/> ;

  dcterms:title "Example WaterInfrastructure"@en ;

  dcterms:description "Example WaterInfrastructure"@en .







#################################################################

#################################################################

#    Datatypes

#    Datatypes