Merge pull request #566 from ucoProject/BugFix-Issue-562

Issue 562: Revise pattern:patternExpression to be object property, and test for error form

ontology/owl/owl.ttl

@@ -435,6 +435,16 @@ uco-owl:rdf-rest-subjects-shape
 	sh:targetSubjectsOf rdf:rest ;
 	.
 
+uco-owl:sh-datatype-objects-shape
+	a sh:NodeShape ;
+	sh:description "This shape enforces that the sh:datatype constraining predicate does not bind an OWL class for a literal-valued constraint."@en ;
+	sh:not [
+		a sh:NodeShape ;
+		sh:class owl:Class ;
+	] ;
+	sh:targetObjectsOf sh:datatype ;
+	.
+
 uco-owl:unionOf-subjects-shape
 	a sh:NodeShape ;
 	sh:property [

ontology/uco/pattern/pattern.ttl

@@ -26,7 +26,7 @@ pattern:LogicalPattern
 	rdfs:label "LogicalPattern"@en ;
 	rdfs:comment "A logical pattern is a grouping of characteristics unique to an informational pattern expressed via a structured pattern expression following the rules of logic."@en ;
 	sh:property [
-		sh:datatype pattern:PatternExpression ;
+		sh:datatype xsd:string ;
 		sh:maxCount "1"^^xsd:integer ;
 		sh:nodeKind sh:Literal ;
 		sh:path pattern:patternExpression ;
@@ -48,18 +48,24 @@ pattern:Pattern
 pattern:PatternExpression
 	a
 		owl:Class ,
+		owl:DeprecatedClass ,
 		sh:NodeShape
 		;
 	rdfs:subClassOf core:UcoInherentCharacterizationThing ;
 	rdfs:label "PatternExpression"@en ;
 	rdfs:comment "A pattern expression is a grouping of characteristics unique to an explicit logical expression defining a pattern (e.g., regular expression, SQL Select expression, etc.)."@en ;
+	sh:message "pattern:PatternExpression is deprecated, and an error to use as of UCO 2.0.0.  xsd:string should be used instead." ;
+	sh:not [
+		a sh:NodeShape ;
+		sh:class pattern:PatternExpression ;
+	] ;
 	sh:targetClass pattern:PatternExpression ;
 	.
 
 pattern:patternExpression
 	a owl:DatatypeProperty ;
 	rdfs:label "patternExpression"@en ;
 	rdfs:comment "An explicit logical pattern expression."@en ;
-	rdfs:range pattern:PatternExpression ;
+	rdfs:range xsd:string ;
 	.