Merge pull request #156 from casework/include_closure_in_monolithic_builds

Include closure in monolithic builds

Author: kchason

case_utils/ontology/Makefile

@@ -40,15 +40,30 @@ $(case_srcdir)/.venv.done.log: \
 	touch -c $@
 	test -r $@
 
+# Build monolith including transitive import closure outside of
+# CDO-maintained ontologies, removing need for network retrieval for
+# non-CDO class and property definitions.
 case-$(case_version).ttl: \
   $(case_srcdir)/.venv.done.log \
   $(RDF_TOOLKIT_JAR)
 	$(MAKE) \
 	  --directory $(case_srcdir)/tests \
 	    case_monolithic.ttl
-	cp \
-	  $(case_srcdir)/tests/case_monolithic.ttl \
-	  $@
+	source $(case_srcdir)/venv/bin/activate \
+	  && rdfpipe \
+	    --output-format turtle \
+	    $(case_srcdir)/tests/case_monolithic.ttl \
+	    $(uco_srcdir)/dependencies/collections-ontology/collections.owl \
+	    $(uco_srcdir)/dependencies/error/docs/current/error.ttl \
+	    > __$@
+	java -jar $(RDF_TOOLKIT_JAR) \
+	  --inline-blank-nodes \
+	  --source __$@ \
+	  --source-format turtle \
+	  --target _$@ \
+	  --target-format turtle
+	rm __$@
+	mv _$@ $@
 
 case-$(case_version)-subclasses.ttl: \
   case-$(case_version).ttl \

case_utils/ontology/case-1.0.0-subclasses.ttl

@@ -3,10 +3,26 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xs: <http://www.w3.org/2001/XMLSchema#> .
 
+<http://purl.org/co/Bag>
+	rdfs:subClassOf <http://purl.org/co/Collection> ;
+	.
+
+<http://purl.org/co/Collection>
+	rdfs:subClassOf owl:Thing ;
+	.
+
+<http://purl.org/co/Item>
+	rdfs:subClassOf owl:Thing ;
+	.
+
 <http://purl.org/co/ListItem>
 	rdfs:subClassOf <http://purl.org/co/Item> ;
 	.
 
+<http://purl.org/co/Set>
+	rdfs:subClassOf <http://purl.org/co/Collection> ;
+	.
+
 <https://ontology.caseontology.org/case/investigation/Attorney>
 	rdfs:subClassOf <https://ontology.unifiedcyberontology.org/uco/role/Role> ;
 	.