Index: /trunk/grails-app/conf/BootStrap.groovy
===================================================================
--- /trunk/grails-app/conf/BootStrap.groovy	(revision 269)
+++ /trunk/grails-app/conf/BootStrap.groovy	(revision 270)
@@ -13,7 +13,7 @@
         {
             case "development":
-                        //createDataService.ensureSystemAndAdminAccess()
-                        //createDataService.createBaseData()
-                        //createDataService.createDemoData()
+                        createDataService.ensureSystemAndAdminAccess()
+                        createDataService.createBaseData()
+                        createDataService.createDemoData()
                         break
             case "test":
Index: /trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateDataService.groovy	(revision 269)
+++ /trunk/grails-app/services/CreateDataService.groovy	(revision 270)
@@ -60,5 +60,4 @@
         createBaseSupplierType()
         createBaseManufacturerType()
-        createBaseExtenededAttributeTypes()
 
         // Tasks
@@ -74,7 +73,8 @@
         createBaseInventoryTypes()
         createBaseInventoryMovementTypes()
+
+        // Assets
+        createBaseExtenededAttributeTypes()
         createBaseMaintenancePolicies()
-
-        // Assets
 
         // Record that data has been created.
@@ -129,7 +129,7 @@
         createDemoMaintenanceActions()
         createDemoSections()
-        createDemoAssetSubItems()
         createDemoAssets()
         createDemoAssetExtenedAttributes()
+        createDemoAssetSubItems()
 
         // Record that data has been created.
@@ -927,4 +927,46 @@
     }
 
+    def createBaseExtenededAttributeTypes() {
+
+        //ExtendedAttributeType
+        def extendedAttributeTypeInstance
+
+        //ExtendedAttributeType #1
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Model Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #2
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Purchase Cost")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #3
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Serial Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #4
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufactured Date")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #5
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Location Description")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #6
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Centre")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #7
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Code")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #8
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufacturer's Number")
+        saveAndTest(extendedAttributeTypeInstance)
+
+        //ExtendedAttributeType #9
+        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Inventory Number")
+        saveAndTest(extendedAttributeTypeInstance)
+    }
+
     def createBaseMaintenancePolicies() {
 
@@ -1014,106 +1056,68 @@
     }
 
+    def createDemoAssets() {
+
+        //Asset
+        def assetInstance
+
+        //Asset #1
+        assetInstance = new Asset(name: "Print Tower 22",
+                                                        section: Section.get(1))
+        saveAndTest(assetInstance)
+//        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
+
+        //Asset #2
+        assetInstance = new Asset(name: "Print Tower 21",
+                                                        section: Section.get(1))
+        saveAndTest(assetInstance)
+
+        //Asset #3
+        assetInstance = new Asset(name: "Print Tower 23",
+                                                        section: Section.get(1))
+        saveAndTest(assetInstance)
+
+        //Asset #4
+        assetInstance = new Asset(name: "RO 1",
+                                                        section: Section.get(2))
+        saveAndTest(assetInstance)
+    }
+
     def createDemoAssetSubItems() {
 
-//         //AssetSubItem
-//         def assetSubItemInstance
-// 
-//         //AssetSubItem #1
-//         assetSubItemInstance = new AssetSubItem(name: "Print Unit")
-//         saveAndTest(assetSubItemInstance)
-// 
-//         //AssetSubItem #2
-//         assetSubItemInstance = new AssetSubItem(name: "Reactor Tower")
-//         saveAndTest(assetSubItemInstance)
-    }
-
-    def createDemoAssets() {
-
-//         //Asset
-//         def assetInstance
-// 
-//         //Asset #1
-//         assetInstance = new Asset(name: "Print Unit 22",
-//                                                         section: Section.get(1))
-//         saveAndTest(assetInstance)
-// //        assetInstance.addToMaintenanceActions(MaintenanceAction.get(1))
-// 
-//         //Asset #2
-//         assetInstance = new Asset(name: "Print Unit 21",
-//                                                         assetSubItem: AssetSubItem.get(1),
-//                                                         section: Section.get(1))
-//         saveAndTest(assetInstance)
-// 
-//         //Asset #3
-//         assetInstance = new Asset(name: "Print Unit 23",
-//                                                         assetSubItem: AssetSubItem.get(1),
-//                                                         section: Section.get(1))
-//         saveAndTest(assetInstance)
-// 
-//         //Asset #4
-//         assetInstance = new Asset(name: "RO 1",
-//                                                         assetSubItem: AssetSubItem.get(2),
-//                                                         section: Section.get(2))
-//         saveAndTest(assetInstance)
-    }
-
-    def createBaseExtenededAttributeTypes() {
-
-        //ExtendedAttributeType
-        def extendedAttributeTypeInstance
-
-        //ExtendedAttributeType #1
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Model Number")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #2
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Purchase Cost")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #3
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Serial Number")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #4
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufactured Date")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #5
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Location Description")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #6
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Centre")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #7
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Cost Code")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #8
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Manufacturer's Number")
-        saveAndTest(extendedAttributeTypeInstance)
-
-        //ExtendedAttributeType #9
-        extendedAttributeTypeInstance = new ExtendedAttributeType(name: "Inventory Number")
-        saveAndTest(extendedAttributeTypeInstance)
+        //AssetSubItem
+        def assetSubItemInstance
+
+        //AssetSubItem #1
+        assetSubItemInstance = new AssetSubItem(name: "Print Unit Lower",
+                                                                                asset: Asset.get(2))
+        saveAndTest(assetSubItemInstance)
+
+        //AssetSubItem #2
+        assetSubItemInstance = new AssetSubItem(name: "Print Unit Upper",
+                                                                                asset: Asset.get(2))
+        saveAndTest(assetSubItemInstance)
+
+        //AssetSubItem #3
+        assetSubItemInstance = new AssetSubItem(name: "Reactor Tower",
+                                                                                asset: Asset.get(1))
+        saveAndTest(assetSubItemInstance)
     }
 
     def createDemoAssetExtenedAttributes() {
 
-//         //AssetExtendedAttribute
-//         def assetExtendedAttributeInstance
-// 
-//         //AssetExtendedAttribute #1
-//         assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2",
-//                                                                                                                     asset: Asset.get(1),
-//                                                                                                                     assetExtendedAttributeType: ExtendedAttributeType.get(1))
-//         saveAndTest(assetExtendedAttributeInstance)
-// 
-//         //AssetExtendedAttribute #2
-//         assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5",
-//                                                                                                                     asset: Asset.get(1),
-//                                                                                                                     assetExtendedAttributeType: ExtendedAttributeType.get(5))
-//         saveAndTest(assetExtendedAttributeInstance)
+        //AssetExtendedAttribute
+        def assetExtendedAttributeInstance
+
+        //AssetExtendedAttribute #1
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "PU Mark 2",
+                                                                                                                    asset: Asset.get(1),
+                                                                                                                    extendedAttributeType: ExtendedAttributeType.get(1))
+        saveAndTest(assetExtendedAttributeInstance)
+
+        //AssetExtendedAttribute #2
+        assetExtendedAttributeInstance = new AssetExtendedAttribute(value: "On the far side of Tank 5",
+                                                                                                                    asset: Asset.get(1),
+                                                                                                                    extendedAttributeType: ExtendedAttributeType.get(5))
+        saveAndTest(assetExtendedAttributeInstance)
     }