Index: trunk/grails-app/domain/MaintenanceAction.groovy
===================================================================
--- trunk/grails-app/domain/MaintenanceAction.groovy	(revision 125)
+++ trunk/grails-app/domain/MaintenanceAction.groovy	(revision 127)
@@ -1,5 +1,5 @@
-class MaintenanceAction {
+class TaskAction {
+    Task task
     MaintenancePolicy maintenancePolicy
-    PlannedMaintenance plannedMaintenance
     SystemSection systemSection
     Asset asset
@@ -8,12 +8,12 @@
     SubAssembly subAssembly
     ComponentItem componentItem
-    String maintenanceAction
+    String action
     String reasoning = ""
-    Integer pmStepNumber
+    Integer stepNumber
     boolean isActive = true
 
 //     static hasMany = []
 
-    static belongsTo = [PlannedMaintenance]
+//     static belongsTo = []
 
     static constraints = {
@@ -24,5 +24,5 @@
         subAssembly(blank:true, nullable:true)
         componentItem(blank:true, nullable:true)
-        pmStepNumber(blank:true, nullable:true)
+        stepNumber(blank:true, nullable:true)
     }
 
Index: trunk/grails-app/domain/Person.groovy
===================================================================
--- trunk/grails-app/domain/Person.groovy	(revision 125)
+++ trunk/grails-app/domain/Person.groovy	(revision 127)
@@ -13,4 +13,7 @@
     String lastName
     String employeeID
+
+    /* Set after login by 'welcome' action, default to 12 hours, aka "sess.setMaxInactiveInterval(seconds) */
+    Integer sessionTimeout = 720
 
 	/** MD5 Password */
@@ -42,4 +45,5 @@
         //So we need to use pass for validation then encode it for above.
         pass(blank: false, minSize:4)
+        sessionTimeout(min:60, max:720)
 
 	}
Index: trunk/grails-app/domain/RecurringSchedule.groovy
===================================================================
--- trunk/grails-app/domain/RecurringSchedule.groovy	(revision 125)
+++ trunk/grails-app/domain/RecurringSchedule.groovy	(revision 127)
@@ -1,11 +1,11 @@
-class RecurringSchedule {
+class TaskRecurringSchedule {
 
     Task task
+//     Task lastGeneratedSubTask
     Period period
-    PlannedMaintenance plannedMaintenance
 
     Integer recurEvery
     Date startDate = new Date()
-    Date lastExecutedDate
+    Date lastGeneratedDate
     Date nextDueDate
     boolean isActive = true
@@ -16,6 +16,5 @@
 
     static constraints = {
-        plannedMaintenance(blank:true, nullable:true)
-        lastExecutedDate(blank:true, nullable:true)
+//         lastGeneratedDate(blank:true, nullable:true)
     }