Revert "Even more cleanup"

This reverts commit 5d0e39c2.

@@ -60,6 +60,53 @@ ILAP:ActivityDependency
                         "1"^^xsd:nonNegativeInteger
               ] .
 
+ILAP:ActivityInPlan_1
+      rdf:type ILAP:PlannedActivity ;
+      rdfs:label "Activity in plan 1"^^xsd:string ;
+      ILAP:hasActivityActualProgressPercent
+              "75"^^xsd:float ;
+      ILAP:hasActivityContractor
+              BRREG:BakerHughes ;
+      ILAP:hasActivityEstimatedWeight
+              "10500"^^xsd:float ;
+      ILAP:hasActivityLocation
+              NCS:NPDelement_1 ;
+      ILAP:hasActivityPhysicalPercentComplete
+              "70"^^xsd:float ;
+      ILAP:hasActivityPlan
+              <http://data.posccaesar.org/Data/UC1/ProjectPlan_1> ;
+      ILAP:hasActivityPlannedProgressPercent
+              80 ;
+      ILAP:hasActivityPlannedResource
+              <http://data.posccaesar.org/Data/UC1/PlannedResource_1> ;
+      ILAP:hasActivityRegulator
+              BRREG:NPD ;
+      ILAP:hasActivityResponsiblePerson
+              POB:RolfHansen ;
+      ILAP:hasActivityStatus
+              ILAP:Active ;
+      ILAP:hasActivitySupplier
+              BRREG:BakerHughes ;
+      ILAP:hasActivityTaskLeader
+              POB:NiloErdal ;
+      ILAP:hasActivityVendor
+              BRREG:BakerHughes ;
+      ILAP:hasActivityWBSelement
+              ILAP:ActivityWBS_1 ;
+      ILAP:hasActivityWeight
+              "10800"^^xsd:float ;
+      ILAP:hasActivityWorkVolume
+              "250"^^xsd:float ;
+      ILAP:hasExternalReference
+              <http://data.posccaesar.org/Data/UC1/ExternalReference_1> ;
+      ILAP:hasFixedFinish "2014-10-17"^^xsd:date ;
+      ILAP:hasFixedStart "2014-09-01"^^xsd:date ;
+      ILAP:hasObjectDescription
+              "Specific text object"^^xsd:string ;
+      ILAP:hasObjectName "Soecific object name"^^xsd:string ;
+      ILAP:hasObjectReferenceID
+              "Specific object ID"^^xsd:string .
+
 ILAP:ActivityPlan
       rdf:type owl:Class , <http://rds.posccaesar.org/2008/02/OWL/ISO-15926-2_2003#ClassOfInformationObject> ;
       rdfs:label "Activity Plan"^^xsd:string ;
@@ -80,6 +127,10 @@ ILAP:ActivityWBS
       rdfs:label "Activity WBS"^^xsd:string ;
       rdfs:subClassOf ILAP:Network .
 
+ILAP:ActivityWBS_1
+      rdf:type ILAP:ActivityWBS ;
+      rdfs:label "Activity WBS 1"^^xsd:string .
+
 ILAP:After_Shutdown
       rdf:type ILAP:ShutdownType ;
       rdfs:label "After Shutdown"^^xsd:string .

@@ -14,7 +14,7 @@
 @prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
 
 :     rdf:type owl:Ontology ;
-      owl:imports <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> , ILAP: .
+      owl:imports ILAP: , <http://data.posccaesar.org/ilap/refdata/NORSOK/Z-014/SCCS> .
 
 :SummerSystemShutdown
       rdf:type ILAP:Shutdown ;
@@ -122,8 +122,8 @@ ILAP:DG7
       rdfs:label "DG7"^^xsd:string .
 
 ILAP:Development
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
-      rdfs:label "Develop"^^xsd:string , "Development"^^xsd:string .
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
+      rdfs:label "Development"^^xsd:string , "Develop"^^xsd:string .
 
 ILAP:DisasterRecovery
       rdf:type ILAP:PlanObjectiveType ;
@@ -138,7 +138,7 @@ ILAP:DrillingAndWell
       rdfs:label "Drilling and well"^^xsd:string .
 
 ILAP:Exploration
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
       rdfs:label "Exploration"^^xsd:string .
 
 ILAP:Facility
@@ -250,7 +250,7 @@ ILAP:OPEX
       rdfs:label "OPEX"^^xsd:string .
 
 ILAP:Operation
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
       rdfs:label "Operation"^^xsd:string .
 
 ILAP:OperationAndMaintenance
@@ -265,8 +265,14 @@ ILAP:Planned
       rdf:type ILAP:Status ;
       rdfs:label "Planned"^^xsd:string .
 
+ILAP:PlannedActivity_1
+      rdf:type ILAP:PlannedActivity ;
+      rdfs:label "Planned activity 1"^^xsd:string ;
+      ILAP:hasActivityWBSelement
+              ILAP:ActivityWBS_1 .
+
 ILAP:Planning
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
       rdfs:label "Planning"^^xsd:string .
 
 ILAP:Primavera
@@ -294,7 +300,7 @@ ILAP:Released
       rdfs:label "Released"^^xsd:string .
 
 ILAP:Removal
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
       rdfs:label "Removal"^^xsd:string .
 
 ILAP:Renewal
@@ -330,14 +336,14 @@ ILAP:Scheduled
       rdfs:label "Scheduled"^^xsd:string .
 
 ILAP:ShutdownAndDecommisioning
-      rdf:type ILAP:PlanLifecycleStage , ILAP:PlanPhase ;
+      rdf:type ILAP:PlanPhase , ILAP:PlanLifecycleStage ;
       rdfs:label "Shutdown and decommisioning"^^xsd:string .
 
 ILAP:StandardFreeWeekendPeriod
       rdf:type ILAP:CalendarFreePeriodWeekRepeat ;
       rdfs:label "Standard free weekend period"^^xsd:string ;
       ILAP:hasCalendarPeriodFreeDay
-              ILAP:Sunday , ILAP:Saturday .
+              ILAP:Saturday , ILAP:Sunday .
 
 ILAP:StandardWorkWeekdayPeriod
       rdf:type ILAP:CalendarWorkPeriodWeekRepeat ;
@@ -439,12 +445,12 @@ ILAP:hasWorkTaskResponsible
 <http://data.posccaesar.org/npd/ontology/ilap-interface/Facility>
       rdf:type owl:Class ;
       rdfs:label "Facility"^^xsd:string ;
-      rdfs:subClassOf ILAP:Facility , owl:Thing .
+      rdfs:subClassOf owl:Thing , ILAP:Facility .
 
 <http://data.posccaesar.org/rdl/RDS282149>
       rdf:type owl:Class ;
       rdfs:label "RDS282149"^^xsd:string ;
-      rdfs:subClassOf ILAP:ResponsibleOrganization , owl:Thing .
+      rdfs:subClassOf owl:Thing , ILAP:ResponsibleOrganization .
 
 <http://www.ilap.no/codes/NORSOK/Z-014/CORCoding#A>
       rdfs:subClassOf <http://data.posccaesar.org/sccs/CORcode> .