Skip to content

Commit

Permalink
Added sections for change set delivery and history (#618)
Browse files Browse the repository at this point in the history 
* Added sections for change set delivery and history

These came from David Honey's proposal.

* Fixed value type errors from ShapeChecker

* Three more value type updates

* Fixed some issues in existing OASIS Standareds

QM was adding the revision to the OASIS Standard path name: os01 should have been os causing broken links. There are no revisions to standards.
trs-vcab.ttl was misspelled.

* Updated config to version 1.1 and created PSD in preparation for publishing
  • Loading branch information
Jim Amsden authored Aug 8, 2024
1 parent 1c8c523 commit 5266998
Show file tree
Hide file tree
Showing 12 changed files with 399 additions and 68 deletions.
2 changes: 2 additions & 0 deletions specs/config/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
This directory contains the source files for the OSLC Configuration Management Specification,
which is one of the work products of the OASIS OSLC Open Project.

Version 1.1 extends OASIS Standard version 1.0 with change set delivery and history.

Earlier draft revisions of this specification were work products of the OASIS OSLC Core Technical
Committee, and may be found in the [OASIS OSLC Core TC SVN repo](https://tools.oasis-open.org/version-control/browse/wsvn/oslc-core/trunk/specs/config/).

Expand Down
Binary file added specs/config/Resources/OSLC Configuration Management Delivery and Delivery History.pdf
View file
Binary file not shown.
218 changes: 200 additions & 18 deletions specs/config/config-resources.html
View file

Large diffs are not rendered by default.

113 changes: 109 additions & 4 deletions specs/config/config-shapes.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

@prefix : <http://open-services.net/ns/config/shapes/1.0/#> .
@prefix : <http://open-services.net/ns/config/shapes/1.1/#> .

:
a oslc:ResourceShapeConstraints ;
rdfs:label "Resource Shapes for OSLC Configuration Management" ;
dcterms:title "Resource Shapes for OSLC Configuration Management" ;
dcterms:description "Shapes for resources defined by OSLC Configuration Management."^^rdf:XMLLiteral ;
dcterms:publisher <https://open-services.net/about/> ;
dcterms:source <https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/config-shapes.ttl> ;
dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/oslc-config-mgt.html> ;
dcterms:hasVersion "PS" ;
dcterms:source <https://docs.oasis-open-projects.org/oslc-op/config/v1.1/os/config-shapes.ttl> ;
dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/config/v1.1/os/oslc-config-mgt.html> ;
dcterms:hasVersion "PSD" ;
dcterms:license <http://www.apache.org/licenses/LICENSE-2.0> ;
dcterms:issued "2023-07-23"^^<http://www.w3.org/2001/XMLSchema#date> ;
dcterms:dateCopyrighted "2012-2023" .
Expand Down Expand Up @@ -931,6 +931,111 @@ or to a change set that include both a `oslc_config:RemoveAll` and a `oslc_confi
{{servers MAY treat occurrences of potentially conflicting selections as an error}}."""^^rdf:XMLLiteral
] .

:ChangeSetDeliveryShape
a oslc:ResourceShape ;
oslc:describes oslc_config:ChangeSetDelivery ;
dcterms:title "The shape of a ChangeSetDelivery." ;
dcterms:description """A ChangeSetDelivery is a resource representing the delivery of a single change set to a single target stream."""^^rdf:XMLLiteral ;

oslc:property

[
a oslc:Property ;
oslc:name "type" ;
oslc:propertyDefinition rdf:type ;
oslc:occurs oslc:One-or-many ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range rdfs:Class ;
dcterms:description """A resource type URI.
{{A change set delivery MUST have at least the resource type `oslc_config:ChangeSetDelivery`}}.
Clients may infer a resource type of `oslc_config:ChangeSetDelivery`,
but there is no requirement for servers to materialize this triple in the RDF representation.
."""^^rdf:XMLLiteral
] ,
[
a oslc:Property ;
oslc:name "sourceConfiguration" ;
oslc:propertyDefinition oslc_config:sourceConfiguration ;
oslc:occurs oslc:Exactly-one ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range oslc_config:ChangeSet ;
dcterms:description """A reference to a resource identifying the change set that was
delivered. This cannot be modified after creation."""^^rdf:XMLLiteral
] ,
[
a oslc:Property ;
oslc:name "targetStream" ;
oslc:propertyDefinition oslc_config:targetStream ;
oslc:occurs oslc:Exactly-one ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range oslc_config:Configuration ;
dcterms:description """A reference to a resource identifying the stream to which the
change set was delivered. This cannot be modified after creation."""^^rdf:XMLLiteral
] ,

:created ,
:creator ,
:description ,
:identifier ,
:instanceShape ,
:modified ,
:modifiedBy ,
:shortId ,
:shortTitle ,
:subject ,
:title .


:ChangeSetDeliveryConflictShape
a oslc:ResourceShape ;
oslc:describes oslc:Error ;
dcterms:title "The shape of a ChangeSetDeliveryConflict." ;
dcterms:description """A ChangeSetDeliveryConflict is a resource representing a conflict error in the delivery of a single change set to a single target stream."""^^rdf:XMLLiteral ;

oslc:property

[
a oslc:Property ;
oslc:name "type" ;
oslc:propertyDefinition rdf:type ;
oslc:occurs oslc:One-or-many ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range rdfs:Class ;
dcterms:description """A resource type URI.
{{A change set delivery conflict MUST have at least the resource type `oslc_config:ChangeSetDeliveryConflict`}}.
Clients may infer a resource type of `oslc_config:ChangeSetDeliveryConflict`,
but there is no requirement for servers to materialize this triple in the RDF representation.
."""^^rdf:XMLLiteral
] ,
[
a oslc:Property ;
oslc:name "sourceVersionResource" ;
oslc:propertyDefinition oslc_config:sourceVersionResource ;
oslc:occurs oslc:Exactly-one ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range oslc_config:VersionResource ;
dcterms:description """The version resource in the source
configuration that is in conflict."""^^rdf:XMLLiteral
] ,
[
a oslc:Property ;
oslc:name "targetVersionResource" ;
oslc:propertyDefinition oslc_config:targetVersionResource ;
oslc:occurs oslc:Exactly-one ;
oslc:representation oslc:Reference ;
oslc:valueType oslc:Resource ;
oslc:range oslc_config:VersionResource ;
dcterms:description """The version resource in the target
stream that is in conflict."""^^rdf:XMLLiteral
] .



# ============================ Activity shape ============================

:ActivityShape
Expand Down
26 changes: 13 additions & 13 deletions specs/config/config-vocab.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
<head>
<meta charset="utf-8" />
<meta name="description" content="OSLC Configuration Management RDF Vocabulary" />
<title>OSLC Configuration Management Version 1.0. Part 4: RDF Vocabulary</title>
<title>OSLC Configuration Management Version 1.1. Part 4: RDF Vocabulary</title>
<script
src="https://cdn.jsdelivr.net/gh/oasis-tcs/tab-respec@v2.1.32/builds/respec-oasis-common.min.js"
src="https://cdn.jsdelivr.net/gh/oasis-tcs/tab-respec@v2.1.35/builds/respec-oasis-common.min.js"
async
class="remove"
></script>
<script class="remove">
var filePath = "/config-vocab.html";
var status = "OS";
var status = "PSD";
var wdBase = "https://oslc-op.github.io/oslc-specs/specs/config";
var oasisBase = "https://docs.oasis-open-projects.org/oslc-op/config/v1.0";
var rev = "";
var oasisBase = "https://docs.oasis-open-projects.org/oslc-op/config/v1.1";
var rev = "01";
var thisBase = wdBase;
if (status != "WD") {
thisBase = oasisBase + "/" + status.toLowerCase() + rev;
}
var respecConfig = {
shortName: "oslc-config-vocab",
citationLabel: "OSLC-Config-1.0-Part4",
citationLabel: "OSLC-Config-1.1-Part4",
specStatus: status,
revision: rev,
conformanceLabelPrefix: "CONFIG-VOCAB",
Expand All @@ -43,7 +43,7 @@
publishDate: "2023-07-23T12:00Z",
//previousPublishDate: "2022-05-30T12:00Z",
//previousMaturity: "PS",
prevVersion: "https://docs.oasis-open-projects.org/oslc-op/config/v1.0/ps01/config-vocab.html",
prevVersion: "https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/config-vocab.html",

// chairs and editors, add as many as you like
// only "name" is required
Expand Down Expand Up @@ -77,27 +77,27 @@
// Other parts of multi-part spec
additionalArtifacts: [
{
title: "OSLC Configuration Management Version 1.0. Part 1: Overview",
title: "OSLC Configuration Management Version 1.1. Part 1: Overview",
href: thisBase + "/oslc-config-mgt.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 2: Versioned Resources",
title: "OSLC Configuration Management Version 1.1. Part 2: Versioned Resources",
href: thisBase + "/versioned-resources.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 3: Configuration Specification",
title: "OSLC Configuration Management Version 1.1. Part 3: Configuration Specification",
href: thisBase + "/config-resources.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 4: RDF Vocabulary (this document)",
title: "OSLC Configuration Management Version 1.1. Part 4: RDF Vocabulary (this document)",
href: thisBase + "/config-vocab.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 5: Machine Readable Vocabulary Terms",
title: "OSLC Configuration Management Version 1.1. Part 5: Machine Readable Vocabulary Terms",
href: thisBase + "/config-vocab.ttl",
},
{
title: "OSLC Configuration Management Version 1.0. Part 6: Machine Readable Vocabulary Constraints",
title: "OSLC Configuration Management Version 1.1. Part 6: Machine Readable Vocabulary Constraints",
href: thisBase + "/config-shapes.ttl",
},
],
Expand Down
36 changes: 33 additions & 3 deletions specs/config/config-vocab.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ oslc_config:
dcterms:title "OSLC Configuration Management vocabulary" ;
dcterms:description "The OSLC Configuration Management vocabulary defines terms for versioned resources and configurations of those versioned resources." ;
dcterms:publisher <https://open-services.net/about/> ;
dcterms:source <https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/config-vocab.ttl> ;
dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/oslc-config-mgt.html> ;
dcterms:hasVersion "PS" ;
dcterms:source <https://docs.oasis-open-projects.org/oslc-op/config/v1.1/os/config-vocab.ttl> ;
dcterms:isPartOf <https://docs.oasis-open-projects.org/oslc-op/config/v1.1/os/oslc-config-mgt.html> ;
dcterms:hasVersion "PSD" ;
dcterms:license <http://www.apache.org/licenses/LICENSE-2.0> ;
dcterms:issued "2023-07-23"^^<http://www.w3.org/2001/XMLSchema#date> ;
dcterms:dateCopyrighted "2012-2023" .
Expand Down Expand Up @@ -69,6 +69,12 @@ oslc_config:ChangeSetSelections
rdfs:subClassOf oslc_config:Selections ;
rdfs:comment "A resource listing the version resources selected by a change set configuration." .

oslc_config:ChangeSetDelivery
a rdfs:Class ;
rdfs:isDefinedBy oslc_config: ;
rdfs:label "ChangeSetDelivery" ;
rdfs:comment "A resource representing the delivery of a single change set to a single target stream." .

oslc_config:Component
a rdfs:Class ;
rdfs:isDefinedBy oslc_config: ;
Expand Down Expand Up @@ -228,6 +234,30 @@ oslc_config:overrides
rdfs:label "overrides" ;
rdfs:comment "A reference to a configuration modified by a change set configuration." .

oslc_config:sourceConfiguration
a rdf:Property ;
rdfs:isDefinedBy oslc_config: ;
rdfs:label "sourceConfiguration" ;
rdfs:comment "The change set that was delivered. This cannot be modified after creation." .

oslc_config:targetStream
a rdf:Property ;
rdfs:isDefinedBy oslc_config: ;
rdfs:label "targetStream" ;
rdfs:comment "The stream to which the change set was delivered. This cannot be modified after creation." .

oslc_config:sourceVersionResource
a rdf:Property ;
rdfs:isDefinedBy oslc_config: ;
rdfs:label "sourceVersionResource" ;
rdfs:comment "The version resource in the source configuration that is in conflict." .

oslc_config:targetVersionResource
a rdf:Property ;
rdfs:isDefinedBy oslc_config: ;
rdfs:label "targetVersionResource" ;
rdfs:comment "The version resource in the target stream that is in conflict." .

oslc_config:previousBaseline
a rdf:Property ;
rdfs:isDefinedBy oslc_config: ;
Expand Down
26 changes: 13 additions & 13 deletions specs/config/oslc-config-mgt.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
name="description"
content="OSLC Configuration Management defines an RDF vocabulary and a set of REST APIs for managing versions and configurations of linked data resources from multiple domains."
/>
<title>OSLC Configuration Management Version 1.0. Part 1: Overview</title>
<title>OSLC Configuration Management Version 1.1. Part 1: Overview</title>
<script
src="https://cdn.jsdelivr.net/gh/oasis-tcs/tab-respec@v2.1.32/builds/respec-oasis-common.min.js"
src="https://cdn.jsdelivr.net/gh/oasis-tcs/tab-respec@v2.1.35/builds/respec-oasis-common.min.js"
async
class="remove"
></script>
<script class="remove">
var filePath = "/oslc-config-mgt.html";
var status = "OS";
var status = "PSD";
var wdBase = "https://oslc-op.github.io/oslc-specs/specs/config";
var oasisBase = "https://docs.oasis-open-projects.org/oslc-op/config/v1.0";
var rev = "";
var oasisBase = "https://docs.oasis-open-projects.org/oslc-op/config/v1.1";
var rev = "01";
var thisBase = wdBase;
if (status != "WD") {
thisBase = oasisBase + "/" + status.toLowerCase() + rev;
}
var respecConfig = {
shortName: "oslc-config-mgt",
citationLabel: "OSLC-Config-1.0-Part1",
citationLabel: "OSLC-Config-1.1-Part1",
specStatus: status,
revision: rev,
conformanceLabelPrefix: "CONFIG-MGT",
Expand All @@ -45,7 +45,7 @@
publishDate: "2023-07-23T12:00Z",
//previousPublishDate: "2022-05-30T12:00Z",
//previousMaturity: "PS",
prevVersion: "https://docs.oasis-open-projects.org/oslc-op/config/v1.0/ps01/oslc-config-mgt.html",
prevVersion: "https://docs.oasis-open-projects.org/oslc-op/config/v1.0/os/oslc-config-mgt.html",

// chairs and editors, add as many as you like
// only "name" is required
Expand Down Expand Up @@ -79,27 +79,27 @@
// Other parts of multi-part spec
additionalArtifacts: [
{
title: "OSLC Configuration Management Version 1.0. Part 1: Overview (this document)",
title: "OSLC Configuration Management Version 1.1. Part 1: Overview (this document)",
href: thisBase + "/oslc-config-mgt.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 2: Versioned Resources",
title: "OSLC Configuration Management Version 1.1. Part 2: Versioned Resources",
href: thisBase + "/versioned-resources.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 3: Configuration Specification",
title: "OSLC Configuration Management Version 1.1. Part 3: Configuration Specification",
href: thisBase + "/config-resources.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 4: RDF Vocabulary",
title: "OSLC Configuration Management Version 1.1. Part 4: RDF Vocabulary",
href: thisBase + "/config-vocab.html",
},
{
title: "OSLC Configuration Management Version 1.0. Part 5: Machine Readable Vocabulary Terms",
title: "OSLC Configuration Management Version 1.1. Part 5: Machine Readable Vocabulary Terms",
href: thisBase + "/config-vocab.ttl",
},
{
title: "OSLC Configuration Management Version 1.0. Part 6: Machine Readable Vocabulary Constraints",
title: "OSLC Configuration Management Version 1.1. Part 6: Machine Readable Vocabulary Constraints",
href: thisBase + "/config-shapes.ttl",
},
],
Expand Down
Loading

0 comments on commit 5266998

Please sign in to comment.