Many changes to help the generating XSD

@@ -36,7 +36,7 @@ userfield:hasFreeFieldForSpecifiedUserField
   rdf:type :Status ;
   rdfs:label "Active"^^xsd:string ;
 .
-:ActivityInPlan
+:Activity
   rdf:type lci:ClassOfIndividual ;
   rdf:type owl:Class ;
   :shouldHaveID "true" ;
@@ -45,6 +45,15 @@ userfield:hasFreeFieldForSpecifiedUserField
   rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS436990091> ;
   rdfs:subClassOf owl:Thing ;
   rdfs:subClassOf [
+      rdf:type owl:Class ;
+      owl:unionOf (
+          :Milestone
+          :Operation
+          :StaffTime
+          :ActivityInPlan
+        ) ;
+    ] ;
+  rdfs:subClassOf [
       rdf:type owl:Restriction ;
       :shouldBeInternalAndExternalRef "true"^^xsd:boolean ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
@@ -69,7 +78,7 @@ userfield:hasFreeFieldForSpecifiedUserField
       rdf:type owl:Restriction ;
       :shouldUseRef "true"^^xsd:boolean ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ActivityInPlan ;
+      owl:onClass :Activity ;
       owl:onProperty :hasParentActivity ;
     ] ;
   rdfs:subClassOf [
@@ -135,6 +144,11 @@ userfield:hasFreeFieldForSpecifiedUserField
     ] ;
   owl:equivalentClass <http://data.posccaesar.org/rdl/RDS3149> ;
 .
+:ActivityInPlan
+  rdf:type owl:Class ;
+  rdfs:label "Activity in plan"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
 :Activity_1
   rdf:type lci:ClassOfIndividual ;
   rdf:type owl:Class ;
@@ -168,7 +182,7 @@ userfield:hasFreeFieldForSpecifiedUserField
       rdf:type owl:Restriction ;
       :shouldUseRef "true"^^xsd:boolean ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ActivityInPlan ;
+      owl:onClass :Activity ;
       owl:onProperty :hasParentActivity ;
     ] ;
   rdfs:subClassOf [
@@ -493,7 +507,7 @@ userfield:hasFreeFieldForSpecifiedUserField
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       :shouldUseRef "true"^^xsd:boolean ;
-      owl:onClass :ActivityInPlan ;
+      owl:onClass :Activity ;
       owl:onProperty :hasSuccessorActivity ;
       owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
     ] ;
@@ -765,7 +779,7 @@ userfield:hasFreeFieldForSpecifiedUserField
   rdf:type owl:Class ;
   rdfs:comment "An Activity that is part of an Activity Plan, with a 0-duration, and in many cases a fixed date. A milestone is normally a specified event within Project, often linked to contractual items."^^xsd:string ;
   rdfs:label "Milestone"^^xsd:string ;
-  rdfs:subClassOf :ActivityInPlan ;
+  rdfs:subClassOf :Activity ;
 .
 :Monday
   rdf:type :Weekday ;
@@ -783,7 +797,7 @@ userfield:hasFreeFieldForSpecifiedUserField
 :Operation
   rdf:type owl:Class ;
   rdfs:comment "An Activity that represents work carried out in Projects, and has (often detailed) descriptions of the actual work carried out."^^xsd:string ;
-  rdfs:subClassOf :ActivityInPlan ;
+  rdfs:subClassOf :Activity ;
 .
 :Pending
   rdf:type :Status ;
@@ -945,7 +959,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
-      owl:onClass :ActivityInPlan ;
+      owl:onClass :Activity ;
       owl:onProperty :hasActivity ;
     ] ;
 .
@@ -969,7 +983,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
   rdf:type owl:Class ;
   rdfs:comment "An Activity that is the creation of one or more instances of PlanForActivity in order to realise a RequiredActivity"^^xsd:string ;
   rdfs:label "Planning"^^xsd:string ;
-  rdfs:subClassOf :ActivityInPlan ;
+  rdfs:subClassOf owl:Thing ;
 .
 :Pre-costed
   rdf:type :Status ;
@@ -1042,7 +1056,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
   rdfs:comment "An Activity that is a temporary endeavor (in contrast with ongoing operations) with a defined beginning and end, constrained by available time, funding and resources, undertaken to achieve an objective conforming to specific requirements, meet unique objectives, and bring about beneficial change or added value (adapted from BSI and Wikipedia)."^^xsd:string ;
   rdfs:label "Project"^^xsd:string ;
   rdfs:seeAlso <http://data.posccaesar.org/rdl/RDS9629> ;
-  rdfs:subClassOf :ActivityInPlan ;
+  rdfs:subClassOf owl:Thing ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
@@ -1424,6 +1438,15 @@ NOTE 2  An activity plan can define a number of part activities which are relate
   rdfs:label "Schedule for activity in plan"^^xsd:string ;
   rdfs:subClassOf owl:Thing ;
   rdfs:subClassOf [
+      rdf:type owl:Class ;
+      owl:unionOf (
+          :BaselineScheduleForPlan
+          :CurrentScheduleForPlan
+          :LiveScheduleForPlan
+          :RevisedScheduleForPlan
+        ) ;
+    ] ;
+  rdfs:subClassOf [
       rdf:type owl:Restriction ;
       :shouldUseRef "true"^^xsd:boolean ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
@@ -1445,7 +1468,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
   rdf:type owl:Class ;
   rdfs:comment "An Activity that is people in employment"^^xsd:string ;
   rdfs:label "Staff time"^^xsd:string ;
-  rdfs:subClassOf :ActivityInPlan ;
+  rdfs:subClassOf :Activity ;
 .
 :Status
   rdf:type owl:Class ;
@@ -1704,7 +1727,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
 .
 :hasActiveStatus
   rdf:type owl:ObjectProperty ;
-  rdfs:domain :ActivityInPlan ;
+  rdfs:domain :Activity ;
 .
 :hasActivity
   rdf:type owl:ObjectProperty ;
@@ -1938,7 +1961,7 @@ NOTE 2  An activity plan can define a number of part activities which are relate
 .
 :hasResponsible
   rdf:type owl:ObjectProperty ;
-  rdfs:domain :ActivityInPlan ;
+  rdfs:domain :Activity ;
   rdfs:label "has responsible"^^xsd:string ;
   rdfs:range :Responsible ;
 .