Index: trunk/grails-app/domain/Assembly.groovy
===================================================================
--- trunk/grails-app/domain/Assembly.groovy	(revision 119)
+++ trunk/grails-app/domain/Assembly.groovy	(revision 121)
@@ -1,9 +1,8 @@
 class Assembly {
-    LifePlan lifeplan
     String name
     String description = ""
     boolean isActive = true
 
-    static hasMany = [assetTypes: AssetType, subAssemblies: SubAssembly]
+    static hasMany = [assetTypes: AssetType, subAssemblies: SubAssembly, maintenanceActions: MaintenanceAction]
 
     static belongsTo = [AssetType]
Index: trunk/grails-app/domain/Asset.groovy
===================================================================
--- trunk/grails-app/domain/Asset.groovy	(revision 119)
+++ trunk/grails-app/domain/Asset.groovy	(revision 121)
@@ -1,20 +1,13 @@
 class Asset {
-    LifePlan lifeplan
+    SystemSection systemSection
     AssetType assetType
     String name
     String description = ""
-    String locationLongText = ""
-    Integer riskPriorityNumber
-    String modelNumber = ""
-    String serialNumber = ""
-    Integer purchaseCost = 0
-    Date manufacturedDate = new Date()
-    
     boolean isActive = true
 
-//     static hasMany = []
-// 
-//     static belongsTo = []
-// 
+    static hasMany = [maintenanceActions: MaintenanceAction]
+
+    static belongsTo = [SystemSection]
+
 //     static constraints = {
 //     }
Index: trunk/grails-app/domain/AssetExtendedAttribute.groovy
===================================================================
--- trunk/grails-app/domain/AssetExtendedAttribute.groovy	(revision 121)
+++ trunk/grails-app/domain/AssetExtendedAttribute.groovy	(revision 121)
@@ -0,0 +1,22 @@
+class AssetExtendedAttribute {
+
+    AssetType assetType
+
+    String name
+    String description = ""
+    String value
+    boolean isActive = true
+
+//     static hasMany = []
+
+    static belongsTo = [AssetType]
+
+//     static constraints = {
+// 
+//     }
+
+    String toString() {
+        "${this.name}"
+    }
+}
+
Index: trunk/grails-app/domain/AssetType.groovy
===================================================================
--- trunk/grails-app/domain/AssetType.groovy	(revision 119)
+++ trunk/grails-app/domain/AssetType.groovy	(revision 121)
@@ -1,13 +1,12 @@
 class AssetType {
-    SystemSection systemSection
-    LifePlan lifeplan
+
     String name
     String description = ""
     boolean isActive = true
 
-    static hasMany = [assets: Asset, assemblies: Assembly]
-// 
+    static hasMany = [assets: Asset, assemblies: Assembly, assetExtendedAttributes: AssetExtendedAttribute, maintenanceActions: MaintenanceAction]
+
 //     static belongsTo = []
-// 
+
 //     static constraints = {
 // 
Index: trunk/grails-app/domain/ComponentItem.groovy
===================================================================
--- trunk/grails-app/domain/ComponentItem.groovy	(revision 119)
+++ trunk/grails-app/domain/ComponentItem.groovy	(revision 121)
@@ -1,10 +1,8 @@
 class ComponentItem {
-    LifePlan lifeplan
     String name
     String description = ""
-    Integer fmeaNumber
     boolean isActive = true
 
-    static hasMany = [subAssemblies: SubAssembly]
+    static hasMany = [subAssemblies: SubAssembly, maintenanceActions: MaintenanceAction]
 
     static belongsTo = [SubAssembly]
Index: trunk/grails-app/domain/Form.groovy
===================================================================
--- trunk/grails-app/domain/Form.groovy	(revision 119)
+++ 	(revision )
@@ -1,19 +1,0 @@
-class Form {
-    String name
-    String description = ""
-    boolean isActive = true
-    boolean isUsed = true
-
-    static hasMany = [lifePlans: LifePlan]
-// 
-//     static belongsTo = []
-// 
-//     static constraints = {
-// 
-//     }
-
-    String toString() {
-        "${this.name}"
-    }
-}
-
Index: trunk/grails-app/domain/LifePlan.groovy
===================================================================
--- trunk/grails-app/domain/LifePlan.groovy	(revision 119)
+++ trunk/grails-app/domain/LifePlan.groovy	(revision 121)
@@ -1,33 +1,14 @@
 class LifePlan {
-    Asset asset
-    Form form
-    Frequency frequency
-    AssetType assetType
-    Assembly assembly
-    SubAssembly subAssembly
-    ComponentItem componentItem
 
     String name
     String description = ""
-    String resourceNumber = ""
-    Integer timeInHours
-    String maintenanceAction
-    String notes = ""
-    
     boolean isActive = true
 
-    static hasMany = [systemSections: SystemSection]
+//     static hasMany = []
 
-    static belongsTo = [SystemSection]
+//     static belongsTo = []
 
-    static constraints = {
-        asset(blank:true,nullable:true)
-        form(blank:true,nullable:true)
-        frequency(blank:true,nullable:true)
-        assetType(blank:true,nullable:true)
-        assembly(blank:true,nullable:true)
-        subAssembly(blank:true,nullable:true)
-        componentItem(blank:true,nullable:true)
-    }
+//     static constraints = {
+//     }
 
     String toString() {
Index: trunk/grails-app/domain/MaintenanceAction.groovy
===================================================================
--- trunk/grails-app/domain/MaintenanceAction.groovy	(revision 121)
+++ trunk/grails-app/domain/MaintenanceAction.groovy	(revision 121)
@@ -0,0 +1,26 @@
+class MaintenanceAction {
+    MaintenancePolicy maintenancePolicy
+    PlannedMaintenance plannedMaintenance
+    SystemSection
+    Asset asset
+    AssetType assetType
+    Assembly assembly
+    SubAssembly subAssembly
+    ComponentItem componentItem
+    String description
+    String reasoning = ""
+    boolean isActive = true
+
+//     static hasMany = []
+
+    static belongsTo = [PlannedMaintenance]
+
+//     static constraints = {
+// 
+//     }
+
+    String toString() {
+        "${this.description}"
+    }
+}
+
Index: trunk/grails-app/domain/MaintenancePolicy.groovy
===================================================================
--- trunk/grails-app/domain/MaintenancePolicy.groovy	(revision 121)
+++ trunk/grails-app/domain/MaintenancePolicy.groovy	(revision 121)
@@ -0,0 +1,18 @@
+class MaintenancePolicy {
+
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [maintenanceActions: MaintenanceAction]
+
+//     static belongsTo = []
+
+//     static constraints = {
+//     }
+
+//     String toString() {
+//         "${this.name}"
+//     }
+}
+
Index: trunk/grails-app/domain/PlannedMaintenance.groovy
===================================================================
--- trunk/grails-app/domain/PlannedMaintenance.groovy	(revision 121)
+++ trunk/grails-app/domain/PlannedMaintenance.groovy	(revision 121)
@@ -0,0 +1,20 @@
+class PlannedMaintenance {
+
+    RecurringSchedule recurringSchedule
+
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [maintenanceActions: MaintenanceAction]
+
+//     static belongsTo = []
+
+//     static constraints = {
+//     }
+
+    String toString() {
+        "${this.name}"
+    }
+}
+
Index: trunk/grails-app/domain/RecurringSchedule.groovy
===================================================================
--- trunk/grails-app/domain/RecurringSchedule.groovy	(revision 121)
+++ trunk/grails-app/domain/RecurringSchedule.groovy	(revision 121)
@@ -0,0 +1,22 @@
+class RecurringSchedule {
+
+    PlannedMaintenance plannedMaintenance
+    Period period
+    Task task
+
+    Integer recurEvery
+    Date startDate = new Date()
+    boolean isActive = true
+
+//     static hasMany = []
+
+    static belongsTo = [Task]
+
+//     static constraints = {
+//     }
+
+//     String toString() {
+//         "${this.name}"
+//     }
+}
+
Index: trunk/grails-app/domain/Site.groovy
===================================================================
--- trunk/grails-app/domain/Site.groovy	(revision 119)
+++ trunk/grails-app/domain/Site.groovy	(revision 121)
@@ -5,5 +5,5 @@
     Boolean isActive = true
 
-    static hasMany = [inventoryStores: InventoryStore]
+    static hasMany = [inventoryStores: InventoryStore, systemSections: SystemSection]
 
 //     static belongsTo = []
Index: trunk/grails-app/domain/SubAssembly.groovy
===================================================================
--- trunk/grails-app/domain/SubAssembly.groovy	(revision 119)
+++ trunk/grails-app/domain/SubAssembly.groovy	(revision 121)
@@ -1,9 +1,9 @@
 class SubAssembly {
-    LifePlan lifeplan
+
     String name
     String description = ""
     boolean isActive = true
 
-    static hasMany = [assemblies: Assembly, componentItems: ComponentItem]
+    static hasMany = [assemblies: Assembly, componentItems: ComponentItem, maintenanceActions: MaintenanceAction]
 
     static belongsTo = [Assembly]
Index: trunk/grails-app/domain/SystemSection.groovy
===================================================================
--- trunk/grails-app/domain/SystemSection.groovy	(revision 119)
+++ trunk/grails-app/domain/SystemSection.groovy	(revision 121)
@@ -1,11 +1,14 @@
 class SystemSection {
+    
+    Site site
+
     String name
     String description = ""
     boolean isActive = true
 
-    static hasMany = [assetTypes: AssetType, lifePlans: LifePlan]
-// 
-//     static belongsTo = []
-// 
+    static hasMany = [assets: Asset, maintenanceActions: MaintenanceAction]
+
+    static belongsTo = [Site]
+
 //     static constraints = {
 // 
Index: trunk/grails-app/domain/Task.groovy
===================================================================
--- trunk/grails-app/domain/Task.groovy	(revision 119)
+++ trunk/grails-app/domain/Task.groovy	(revision 121)
@@ -1,3 +1,4 @@
 class Task {
+
     TaskGroup taskGroup
     TaskStatus taskStatus
@@ -7,4 +8,6 @@
     Person leadPerson
     Asset primaryAsset
+    RecurringSchedule recurringSchedule
+
     String description
     String comment = ""