Index: trunk/grails-app/conf/BootStrap.groovy
===================================================================
--- trunk/grails-app/conf/BootStrap.groovy	(revision 122)
+++ trunk/grails-app/conf/BootStrap.groovy	(revision 124)
@@ -282,5 +282,5 @@
                  leadPerson:Person.get(3),
                  description:"Check specific level sensor",
-                 comment:"Has been noted as problematic, try recallibrating")
+                 comment:"Has been noted as problematic, try recalibrating.")
         BootStrapSaveAndTest(taskInstance)
 
@@ -418,4 +418,10 @@
         BootStrapSaveAndTest(recurringScheduleInstance)
 
+        //RecurringSchedule #2
+        recurringScheduleInstance = new RecurringSchedule(recurEvery: 1,
+                                                                                                    period: Period.get(2),
+                                                                                                    task: Task.get(2))
+        BootStrapSaveAndTest(recurringScheduleInstance)
+
 /*************************
 START OF INVENTORY
@@ -423,5 +429,5 @@
 
 //InventoryStore
-        def inventoryStoreInstance 
+        def inventoryStoreInstance
 
         inventoryStoreInstance = new InventoryStore(site: Site.get(1), name: "Store #1")
@@ -561,8 +567,24 @@
 
 //MaintenancePolicy
-        def maintenancePolicyInstance 
+        def maintenancePolicyInstance
 
         //MaintenancePolicy #1
         maintenancePolicyInstance = new MaintenancePolicy(name: "Fixed Time")
+        BootStrapSaveAndTest(maintenancePolicyInstance)
+
+        //MaintenancePolicy #2
+        maintenancePolicyInstance = new MaintenancePolicy(name: "Condition Based Online")
+        BootStrapSaveAndTest(maintenancePolicyInstance)
+
+        //MaintenancePolicy #3
+        maintenancePolicyInstance = new MaintenancePolicy(name: "Condition Based Offline")
+        BootStrapSaveAndTest(maintenancePolicyInstance)
+
+        //MaintenancePolicy #4
+        maintenancePolicyInstance = new MaintenancePolicy(name: "Design Out")
+        BootStrapSaveAndTest(maintenancePolicyInstance)
+
+        //MaintenancePolicy #5
+        maintenancePolicyInstance = new MaintenancePolicy(name: "Operate To Failure")
         BootStrapSaveAndTest(maintenancePolicyInstance)
 
@@ -575,8 +597,29 @@
         BootStrapSaveAndTest(plannedMaintenanceInstance)
 
+        //PM #2
+        plannedMaintenanceInstance = new PlannedMaintenance(name: "PM2",
+                                                                                                            recurringSchedule: RecurringSchedule.get(1))
+        BootStrapSaveAndTest(plannedMaintenanceInstance)
+
 //MaintenanceAction
         def maintenanceActionInstance
 
-        maintenanceActionInstance = new MaintenanceAction(description: "Do this",
+        //MaintenanceAction #1
+        maintenanceActionInstance = new MaintenanceAction(maintenanceAction: "Check all E-stops, active E-stop S1-S12 and ensure machine cannot run",
+                                                                                                        pmStepNumber: 1,
+                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
+                                                                                                        plannedMaintenance: PlannedMaintenance.get(1))
+        BootStrapSaveAndTest(maintenanceActionInstance)
+
+        //MaintenanceAction #2
+        maintenanceActionInstance = new MaintenanceAction(maintenanceAction: "Do more pushups",
+                                                                                                        pmStepNumber: 2,
+                                                                                                        maintenancePolicy: MaintenancePolicy.get(1),
+                                                                                                        plannedMaintenance: PlannedMaintenance.get(1))
+        BootStrapSaveAndTest(maintenanceActionInstance)
+
+        //MaintenanceAction #3
+        maintenanceActionInstance = new MaintenanceAction(maintenanceAction: "Ok just one more pushup",
+                                                                                                        pmStepNumber: 3,
                                                                                                         maintenancePolicy: MaintenancePolicy.get(1),
                                                                                                         plannedMaintenance: PlannedMaintenance.get(1))
@@ -584,35 +627,31 @@
                                                                                                     
 //SystemSection
-    def systemSectionInstance 
-
+    def systemSectionInstance
+
+    //SystemSection #1
     systemSectionInstance = new SystemSection(name: "Press Section",
                                                                                    site: Site.get(1))
     BootStrapSaveAndTest(systemSectionInstance)
 
+    //SystemSection #2
+    systemSectionInstance = new SystemSection(name: "RO System",
+                                                                                   site: Site.get(2))
+    BootStrapSaveAndTest(systemSectionInstance)
+
+    //SystemSection #3
+    systemSectionInstance = new SystemSection(name: "Auxilliray Section",
+                                                                                   site: Site.get(1))
+    BootStrapSaveAndTest(systemSectionInstance)
+
 //AssetType
         def assetTypeInstance
 
         //AssetType #1
-        assetTypeInstance = new AssetType(name: "Folder")
-        BootStrapSaveAndTest(assetTypeInstance)
-
-        //AssetType #2
         assetTypeInstance = new AssetType(name: "Print Unit")
         BootStrapSaveAndTest(assetTypeInstance)
 
-//AssetExtendedAttributeType
-        def assetExtendedAttributeInstanceType
-
-        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Model Number")
-        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
-
-//AssetExtendedAttribute
-        def assetExtendedAttributeInstance
-
-        //AssetExtendedAttribute #1
-        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "mark 2",
-                                                                                                                    assetType: AssetType.get(1),
-                                                                                                                    assetExtendedAttributeType: AssetExtendedAttributeType.get(1))
-        BootStrapSaveAndTest(assetExtendedAttributeInstance)
+        //AssetType #2
+        assetTypeInstance = new AssetType(name: "Reactor Tower")
+        BootStrapSaveAndTest(assetTypeInstance)
     
 //Assembly
@@ -620,10 +659,10 @@
 
         //Assembly #1
-        assemblyInstance = new Assembly(name: "Delivery Belts")
+        assemblyInstance = new Assembly(name: "Print Couple")
         BootStrapSaveAndTest(assemblyInstance)
 //        assemblyInstance.addToMaintenanceActions(MaintenanceAction.get(1))
         
         //Assembly #2
-        assemblyInstance = new Assembly(name: "Print Couple",
+        assemblyInstance = new Assembly(name: "Agitator",
                         lifeplan: LifePlan.get(1))
         BootStrapSaveAndTest(assemblyInstance)
@@ -633,9 +672,9 @@
 
         //SubAssembly #1
-        subAssemblyInstance = new SubAssembly(name: "Centre Belt")
+        subAssemblyInstance = new SubAssembly(name: "Cylinder")
         BootStrapSaveAndTest(subAssemblyInstance)
  
          //SubAssembly #2
-        subAssemblyInstance = new SubAssembly(name: "Form Roller")
+        subAssemblyInstance = new SubAssembly(name: "Gearmotor")
         BootStrapSaveAndTest(subAssemblyInstance)
 
@@ -651,9 +690,21 @@
         BootStrapSaveAndTest(componentItemInstance)
 
-
 //Asset
         def assetInstance
 
         //Asset #1
+        assetInstance = new Asset(name: "Print Unit 22",
+                                                        assetType: AssetType.get(1),
+                                                        systemSection: SystemSection.get(1))
+        BootStrapSaveAndTest(assetInstance)
+//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
+
+        //Asset #2
+        assetInstance = new Asset(name: "Print Unit 21",
+                                                        assetType: AssetType.get(1),
+                                                        systemSection: SystemSection.get(1))
+        BootStrapSaveAndTest(assetInstance)
+
+        //Asset #3
         assetInstance = new Asset(name: "Print Unit 23",
                                                         assetType: AssetType.get(1),
@@ -661,5 +712,51 @@
         BootStrapSaveAndTest(assetInstance)
 
-//Finally did it all work.        
+        //Asset #4
+        assetInstance = new Asset(name: "RO 1",
+                                                        assetType: AssetType.get(2),
+                                                        systemSection: SystemSection.get(2))
+        BootStrapSaveAndTest(assetInstance)
+
+//AssetExtendedAttributeType
+        def assetExtendedAttributeInstanceType
+
+        //AssetExtendedAttributeType #1
+        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Model Number")
+        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
+
+        //AssetExtendedAttributeType #2
+        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Purchase Cost")
+        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
+
+        //AssetExtendedAttributeType #3
+        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Serial Number")
+        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
+
+        //AssetExtendedAttributeType #4
+        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Manufactured Date")
+        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
+
+        //AssetExtendedAttributeType #5
+        assetExtendedAttributeInstanceType = new AssetExtendedAttributeType(name: "Location Description")
+        BootStrapSaveAndTest(assetExtendedAttributeInstanceType)
+
+//AssetExtendedAttribute
+        def assetExtendedAttributeInstance
+
+        //AssetExtendedAttribute #1
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2",
+                                                                                                                    asset: Asset.get(1),
+                                                                                                                    assetExtendedAttributeType: AssetExtendedAttributeType.get(1))
+        BootStrapSaveAndTest(assetExtendedAttributeInstance)
+
+        //AssetExtendedAttribute #2
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5",
+                                                                                                                    asset: Asset.get(1),
+                                                                                                                    assetExtendedAttributeType: AssetExtendedAttributeType.get(5))
+        BootStrapSaveAndTest(assetExtendedAttributeInstance)
+
+/*************************
+Finally did it all work. 
+**************************/       
         if(BootStrapDemoDataSuccessful) {
             println "BootStrapping demo data...successful."
@@ -668,5 +765,7 @@
     }
 
-//Call this function instead of .save()
+/****************************************
+Call this function instead of .save()
+*****************************************/    
     void BootStrapSaveAndTest(object) {
         if(!object.save()) {