Revert "Merge branch 'issue-363' into unstable"

This reverts commit f4a0111, reversing
changes made to 296497e.

Reverting from `unstable` branch due to scheduling for post-1.0.0.

References:
* ucoProject/UCO#363

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>

ontology/uco/core/core.ttl

@@ -1,19 +1,15 @@
-# imports: http://www.w3.org/TR/skos-reference/skos-owl1-dl.rdf
-
 @prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 <https://ontology.unifiedcyberontology.org/uco/core>
 	a owl:Ontology ;
 	rdfs:label "uco-core"@en ;
 	rdfs:comment "This ontology defines classes and properties that are shared across the various UCO ontologies.  At a high-level, the UCO core ontology provides base classes, relationship-oriented classes, content-aggregation classes, and shared classes."@en ;
-	owl:imports <http://www.w3.org/TR/skos-reference/skos-owl1-dl.rdf> ;
 	.
 
 core:Annotation
@@ -321,13 +317,6 @@ core:Relationship
 	sh:targetClass core:Relationship ;
 	.
 
-core:TaxonomicConcept
-	a owl:Class ;
-	rdfs:subClassOf skos:Concept ;
-	rdfs:label "TaxonomicConcept"@en ;
-	rdfs:comment "Taxonomic Concept is a mix-in class that enables UCO as an OWL ontology to use SKOS taxonomic individuals. [based on https://www.w3.org/2006/07/SWD/SKOS/skos-and-owl/master.html#Hybrids]"@en ;
-	.
-
 core:UcoObject
 	a
 		owl:Class ,

ontology/uco/master/uco.ttl

@@ -1,4 +1,3 @@
-# imports: http://www.w3.org/TR/skos-reference/skos-owl1-dl.rdf
 # imports: https://ontology.unifiedcyberontology.org/co
 # imports: https://ontology.unifiedcyberontology.org/owl
 # imports: https://ontology.unifiedcyberontology.org/uco/action
@@ -26,7 +25,6 @@
 	a owl:Ontology ;
 	rdfs:label "uco-master"@en ;
 	owl:imports
-		<http://www.w3.org/TR/skos-reference/skos-owl1-dl.rdf> ,
 		<https://ontology.unifiedcyberontology.org/co> ,
 		<https://ontology.unifiedcyberontology.org/owl> ,
 		<https://ontology.unifiedcyberontology.org/uco/action> ,

ontology/uco/observable/observable.ttl

@@ -10,15 +10,13 @@
 @prefix co: <http://purl.org/co/> .
 @prefix configuration: <https://ontology.unifiedcyberontology.org/uco/configuration/> .
 @prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix identity: <https://ontology.unifiedcyberontology.org/uco/identity/> .
 @prefix location: <https://ontology.unifiedcyberontology.org/uco/location/> .
 @prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
-@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
 @prefix types: <https://ontology.unifiedcyberontology.org/uco/types/> .
 @prefix vocabulary: <https://ontology.unifiedcyberontology.org/uco/vocabulary/> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -1957,11 +1955,6 @@ observable:ContentDataFacet
 	rdfs:label "ContentDataFacet"@en ;
 	rdfs:comment "A content data facet is a grouping of characteristics unique to a block of digital data."@en ;
 	sh:property
-		[
-			sh:class dcterms:FileFormat ;
-			sh:nodeKind sh:IRI ;
-			sh:path observable:mimeType ;
-		] ,
 		[
 			sh:class observable:ObservableObject ;
 			sh:maxCount "1"^^xsd:integer ;
@@ -2009,6 +2002,11 @@ observable:ContentDataFacet
 			sh:nodeKind sh:Literal ;
 			sh:path observable:mimeClass ;
 		] ,
+		[
+			sh:datatype xsd:string ;
+			sh:nodeKind sh:Literal ;
+			sh:path observable:mimeType ;
+		] ,
 		[
 			sh:datatype vocabulary:EndiannessTypeVocab ;
 			sh:message "Value is outside the default vocabulary EndiannessTypeVocab." ;
@@ -11431,37 +11429,10 @@ observable:mimeClass
 	.
 
 observable:mimeType
-	a owl:ObjectProperty ;
+	a owl:DatatypeProperty ;
 	rdfs:label "mimeType"@en ;
-	rdfs:comment "MIME type of the data. The text form of '${type}/${subtype}' (for example, 'text/html' or 'audio/mp3') can be used to find a UCO-provisioned set of types from the UCO Media Types Taxonomy.  For interoperability with non-UCO resources, dcterms:FileFormat is this property's required range.  The more-specific UCO classes types:IANAMediaType or types:NonIANAMediaType should be used when available."@en ;
-	rdfs:range dcterms:FileFormat ;
-	rdfs:seeAlso
-		types:IANAMediaType ,
-		types:NonIANAMediaType ,
-		<https://taxonomy.unifiedcyberontology.org/uco/mime/>
-		;
-	.
-
-observable:mimeType-class-types-MIMEFormat
-	a sh:PropertyShape ;
-	rdfs:comment "This shape is given an IRI in order to facilitate deactivation on request."@en ;
-	rdfs:seeAlso sh:deactivated ;
-	sh:class types:MIMEFormat ;
-	sh:message "Value is not an instance of types:MIMEFormat or one of its subclasses.  Please consider using a value having type types:IANAMediaType or types:NonIANAMediaType."@en ;
-	sh:path observable:mimeType ;
-	sh:severity sh:Info ;
-	sh:targetSubjectsOf observable:mimeType ;
-	.
-
-observable:mimeType-notation
-	a sh:PropertyShape ;
-	rdfs:comment "This shape is intended to be deactivated by using overriding shapes in the UCO Mime Taxonomy."@en ;
-	rdfs:seeAlso <https://taxonomy.unifiedcyberontology.org/uco/mime/> ;
-	sh:message "The used mimeType value is not a concept with a skos:notation.  Some consumers of this data expect a string with the MIME 'type/subtype' format to be supplied with skos:notation.  Please either add the skos:notation to your input graph or incorporate the UCO MIME Taxonomy."@en ;
-	sh:minCount "1"^^xsd:integer ;
-	sh:path skos:notation ;
-	sh:severity sh:Warning ;
-	sh:targetObjectsOf observable:mimeType ;
+	rdfs:comment "MIME type of the data. For example 'text/html' or 'audio/mp3'."@en ;
+	rdfs:range xsd:string ;
 	.
 
 observable:minorImageVersion

ontology/uco/types/types.ttl

@@ -4,8 +4,6 @@
 
 @prefix co: <http://purl.org/co/> .
 @prefix core: <https://ontology.unifiedcyberontology.org/uco/core/> .
-@prefix dcterms: <http://purl.org/dc/terms/> .
-@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -24,11 +22,6 @@
 		;
 	.
 
-dcterms:FileFormat
-	a owl:Class ;
-	rdfs:comment "UCO extends dcterms:FileFormat to be an OWL Class in addition to its native definition of an RDF Class."@en ;
-	.
-
 types:ControlledDictionary
 	a
 		owl:Class ,
@@ -174,41 +167,16 @@ types:Hash
 	sh:targetClass types:Hash ;
 	.
 
-types:IANAMediaType
-	a owl:Class ;
-	rdfs:subClassOf types:MIMEFormat ;
-	rdfs:label "IANAMediaType"@en ;
-	owl:disjointWith types:NonIANAMediaType ;
-	.
-
 types:Identifier
 	a rdfs:Datatype ;
 	rdfs:comment "An identifier is a string conformant to the specified UUID-based format for UCO object identifiers."@en ;
 	.
 
-types:MIMEFormat
-	a owl:Class ;
-	rdfs:subClassOf
-		dcterms:FileFormat ,
-		core:TaxonomicConcept
-		;
-	rdfs:label "MIMEFormat"@en ;
-	rdfs:comment "This class should be considered an intermediary, 'abstract' class, and should not have individuals defined that are not a member of one of its subclasses.  This class has two purposes.  First, to encode for interoperability with existing frameworks, without relying on RDFS inference, that a UCO MIMEFormat individual is both a SKOS Concept (via core:TaxonomicConcept) and Dublin Core Terms FileFormat.  Second, to guarantee a concept to be used as a UCO MIME type has exactly one skos:notation.  Note that strict SHACL enforcement of the skos:notation presence is not within the UCO Types ontology, but is instead a part of the shapes provided by the UCO MIME Taxonomy.  The warning about skos:notation in the Observable namespace is deactivated on importing the taxonomy's shapes."@en ;
-	rdfs:seeAlso observable:mimeType-notation ;
-	.
-
 types:NativeFormatString
 	a rdfs:Datatype ;
 	rdfs:comment "Specifies data in its native format of some external language. The data may be encoded in Base64 per [RFC4648]. Data encoded in Base64 must be denoted as such using the encoded property."@en ;
 	.
 
-types:NonIANAMediaType
-	a owl:Class ;
-	rdfs:subClassOf types:MIMEFormat ;
-	rdfs:label "NonIANAMediaType"@en ;
-	owl:disjointWith types:IANAMediaType ;
-	.
-
 types:StructuredText
 	a rdfs:Datatype ;
 	rdfs:comment "Expresses string-based data in some information structuring format (e.g., HTML5)."@en ;

tests/examples/Makefile

@@ -31,9 +31,6 @@ all: \
   hash_XFAIL_validation.ttl \
   location_PASS_validation.ttl \
   location_XFAIL_validation.ttl \
-  mime_PASS_validation.ttl \
-  mime_XFAIL_validation.ttl \
-  mime_prefix_PASS_validation.ttl \
   message_thread_PASS_validation.ttl \
   message_thread_XFAIL_validation.ttl \
   owl_axiom_PASS_validation.ttl \
@@ -99,9 +96,6 @@ check: \
   hash_XFAIL_validation.ttl \
   location_PASS_validation.ttl \
   location_XFAIL_validation.ttl \
-  mime_PASS_validation.ttl \
-  mime_XFAIL_validation.ttl \
-  mime_prefix_PASS_validation.ttl \
   message_thread_PASS_validation.ttl \
   message_thread_XFAIL_validation.ttl \
   owl_axiom_PASS_validation.ttl \