Updated version 1.5 with all changes from summer work

@@ -109,9 +109,10 @@ UC1:CurrentSchedule_1
 UC1:ExternalReference_1
       rdf:type ILAP:ExternalReference ;
       rdfs:label "External reference 1"^^xsd:string ;
+      ILAP:hasObjectReferenceID
+              "UC2-Ex2-P6-102"^^xsd:string ;
       ILAP:hasReferenceApplication
-              ILAP:SAP ;
-      ILAP:hasReferenceID "UC2-Ex2-P6-102"^^xsd:string .
+              ILAP:SAP .
 
 UC1:LiveSchedule_1
       rdf:type ILAP:LiveSchedule ;
@@ -190,13 +191,15 @@ UC1:Profile_1
       rdf:type ILAP:ResourceProfile ;
       rdfs:label "Profile 1"^^xsd:string ;
       ILAP:hasProfilePoint
-              ILAP:ProfilePoint_2 , ILAP:ProfilePoint_1 .
+              ILAP:ProfilePoint_1 , ILAP:ProfilePoint_2 .
 
 UC1:ProjectPlan_1
       rdf:type ILAP:ProjectPlan ;
       rdfs:label "Project plan 1"^^xsd:string ;
       ILAP:hasExternalReference
               <http://data.posccaesar.org/Data/UC2/R-1234567890> ;
+      ILAP:hasObjectReferenceID
+              "RDS489590"^^xsd:string ;
       ILAP:hasPlanAssetOwner
               <http://data.posccaesar.org/brreg/EniNorge> ;
       ILAP:hasPlanContractType
@@ -230,8 +233,7 @@ UC1:ProjectPlan_1
       ILAP:hasPlanSupplier
               <http://data.posccaesar.org/brreg/BakerHughes> , <http://data.posccaesar.org/brreg/Schlumberger> ;
       ILAP:hasPlanUserField
-              <http://data.posccaesar.org/NCS_PLANNING/UserField_2> , <http://data.posccaesar.org/NCS_PLANNING/UserField_3> , <http://data.posccaesar.org/NCS_PLANNING/UserField_1> ;
-      ILAP:hasReferenceID "RDS489590"^^xsd:string .
+              <http://data.posccaesar.org/NCS_PLANNING/UserField_2> , <http://data.posccaesar.org/NCS_PLANNING/UserField_3> , <http://data.posccaesar.org/NCS_PLANNING/UserField_1> .
 
 UC1:Project_1
       rdf:type ILAP:Project ;

@@ -17,7 +17,7 @@ UC2:  rdf:type owl:Ontology ;
       owl:imports NCS: .
 
 UC2:ActivityWBS_1
-      rdf:type <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#6> , PBS:AC , ILAP:ActivityWBS , COR:ADA ;
+      rdf:type COR:ADA , ILAP:ActivityWBS , PBS:AC , <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#6> ;
       rdfs:label "Activity WBS 1"^^xsd:string .
 
 UC2:Baseline_1
@@ -33,7 +33,7 @@ UC2:CurrentControlEstimate_1
       rdfs:label "Current control estimate 1"^^xsd:string .
 
 UC2:Discipline_1
-      rdf:type ILAP:Discipline , COR:BEA ;
+      rdf:type COR:BEA , ILAP:Discipline ;
       rdfs:label "Discipline 1"^^xsd:string .
 
 UC2:Discipline_2
@@ -41,7 +41,7 @@ UC2:Discipline_2
       rdfs:label "Discipline 2"^^xsd:string .
 
 UC2:Location_1
-      rdf:type ILAP:Location , NPD:StatfjordA ;
+      rdf:type NPD:StatfjordA , ILAP:Location ;
       rdfs:label "Location 1"^^xsd:string .
 
 UC2:Milestone_1
@@ -76,7 +76,7 @@ UC2:Profile_1
       rdf:type ILAP:ResourceProfile ;
       rdfs:label "Profile 1"^^xsd:string ;
       ILAP:hasProfilePoint
-              UC2:ProfilePoint_2 , UC2:ProfilePoint_1 .
+              UC2:ProfilePoint_1 , UC2:ProfilePoint_2 .
 
 UC2:ProjectPlan_2
       rdf:type ILAP:ProjectPlan ;
@@ -117,7 +117,7 @@ ILAP:ContractorWBS_1
       rdf:type ILAP:ContractorWBS ;
       rdfs:label "Contractor WBS 1"^^xsd:string ;
       ILAP:hasContractorWBSelement
-              "Pump engineer"^^xsd:string , "Installing pump"^^xsd:string , "Installation activity"^^xsd:string .
+              "Installation activity"^^xsd:string , "Installing pump"^^xsd:string , "Pump engineer"^^xsd:string .
 
 ILAP:Discipline_1
       rdf:type COR:CDA .
@@ -125,17 +125,17 @@ ILAP:Discipline_1
 ILAP:PlannedActivity
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ILAP:ResponsibleOrganization ;
-                owl:onProperty ILAP:hasActivityResponsibleOrganization
+                owl:allValuesFrom ILAP:Calendar ;
+                owl:onProperty ILAP:hasActivityCalendar
               ] ;
       rdfs:subClassOf
               [ rdf:type owl:Restriction ;
-                owl:allValuesFrom ILAP:Calendar ;
-                owl:onProperty ILAP:hasActivityCalendar
+                owl:allValuesFrom ILAP:ResponsibleOrganization ;
+                owl:onProperty ILAP:hasActivityResponsibleOrganization
               ] .
 
 ILAP:PlannedActivity_1
-      rdf:type <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#412> , PBS:ACAE , COR:ADA ;
+      rdf:type COR:ADA , PBS:ACAE , <http://www.ilap.no/codes/NORSOK/Z-014/SABCoding#412> ;
       ILAP:hasActivityContractor
               <http://data.posccaesar.org/brreg/Subsea7> ;
       ILAP:hasActivityDiscipline
@@ -155,5 +155,5 @@ ILAP:UC2_ActivityInSchedule_1-hasActivityInScheduleActivityInPlan-UC2_ActivityIn
 ILAP:hasActivityWBS
       rdfs:range ILAP:ActivityWBS .
 
-ILAP:hasReferenceID
+ILAP:hasObjectReferenceID
       rdfs:domain owl:Thing .