Index: /trunk/src/grails-app/conf/BootStrap.groovy
===================================================================
--- /trunk/src/grails-app/conf/BootStrap.groovy	(revision 92)
+++ /trunk/src/grails-app/conf/BootStrap.groovy	(revision 93)
@@ -304,14 +304,14 @@
 
         //ModificationType
-        def modificationTypeInstance
-        modificationTypeInstance = new ModificationType(name:"Created").save()
-        modificationTypeInstance = new ModificationType(name:"Completed").save()
-        modificationTypeInstance = new ModificationType(name:"Closed").save()
-        modificationTypeInstance = new ModificationType(name:"Altered").save()
-        modificationTypeInstance = new ModificationType(name:"TargetDateModified").save()
-        modificationTypeInstance = new ModificationType(name:"ScheduledDateModified").save()
-        modificationTypeInstance = new ModificationType(name:"DescriptionModified").save()
-        modificationTypeInstance = new ModificationType(name:"AssignedToModified").save()
-        modificationTypeInstance = new ModificationType(name:"NameModified").save()
+        def taskModificationTypeInstance
+        taskModificationTypeInstance = new TaskModificationType(name:"Created").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"Completed").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"Closed").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"Altered").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"TargetDateModified").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"ScheduledDateModified").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"DescriptionModified").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"AssignedToModified").save()
+        taskModificationTypeInstance = new TaskModificationType(name:"NameModified").save()
         
         if(BootStrapDemoDataSuccessful) {
Index: unk/src/grails-app/controllers/ModificationController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/ModificationController.groovy	(revision 92)
+++ 	(revision )
@@ -1,84 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class ModificationController extends BaseController {
-    
-    def index = { redirect(action:list,params:params) }
-
-    // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-        if(!params.max) params.max = 10
-        [ modificationInstanceList: Modification.list( params ) ]
-    }
-
-    def show = {
-        def modificationInstance = Modification.get( params.id )
-
-        if(!modificationInstance) {
-            flash.message = "Modification not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ modificationInstance : modificationInstance ] }
-    }
-
-    def delete = {
-        def modificationInstance = Modification.get( params.id )
-        if(modificationInstance) {
-            modificationInstance.delete()
-            flash.message = "Modification ${params.id} deleted"
-            redirect(action:list)
-        }
-        else {
-            flash.message = "Modification not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def modificationInstance = Modification.get( params.id )
-
-        if(!modificationInstance) {
-            flash.message = "Modification not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ modificationInstance : modificationInstance ]
-        }
-    }
-
-    def update = {
-        def modificationInstance = Modification.get( params.id )
-        if(modificationInstance) {
-            modificationInstance.properties = params
-            if(!modificationInstance.hasErrors() && modificationInstance.save()) {
-                flash.message = "Modification ${params.id} updated"
-                redirect(action:show,id:modificationInstance.id)
-            }
-            else {
-                render(view:'edit',model:[modificationInstance:modificationInstance])
-            }
-        }
-        else {
-            flash.message = "Modification not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
-        }
-    }
-
-    def create = {
-        def modificationInstance = new Modification()
-        modificationInstance.properties = params
-        return ['modificationInstance':modificationInstance]
-    }
-
-    def save = {
-        def modificationInstance = new Modification(params)
-        if(!modificationInstance.hasErrors() && modificationInstance.save()) {
-            flash.message = "Modification ${modificationInstance.id} created"
-            redirect(action:show,id:modificationInstance.id)
-        }
-        else {
-            render(view:'create',model:[modificationInstance:modificationInstance])
-        }
-    }
-}
Index: unk/src/grails-app/controllers/ModificationTypeController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/ModificationTypeController.groovy	(revision 92)
+++ 	(revision )
@@ -1,84 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class ModificationTypeController extends BaseController {
-    
-    def index = { redirect(action:list,params:params) }
-
-    // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-        if(!params.max) params.max = 10
-        [ modificationTypeInstanceList: ModificationType.list( params ) ]
-    }
-
-    def show = {
-        def modificationTypeInstance = ModificationType.get( params.id )
-
-        if(!modificationTypeInstance) {
-            flash.message = "ModificationType not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ modificationTypeInstance : modificationTypeInstance ] }
-    }
-
-    def delete = {
-        def modificationTypeInstance = ModificationType.get( params.id )
-        if(modificationTypeInstance) {
-            modificationTypeInstance.delete()
-            flash.message = "ModificationType ${params.id} deleted"
-            redirect(action:list)
-        }
-        else {
-            flash.message = "ModificationType not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def modificationTypeInstance = ModificationType.get( params.id )
-
-        if(!modificationTypeInstance) {
-            flash.message = "ModificationType not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ modificationTypeInstance : modificationTypeInstance ]
-        }
-    }
-
-    def update = {
-        def modificationTypeInstance = ModificationType.get( params.id )
-        if(modificationTypeInstance) {
-            modificationTypeInstance.properties = params
-            if(!modificationTypeInstance.hasErrors() && modificationTypeInstance.save()) {
-                flash.message = "ModificationType ${params.id} updated"
-                redirect(action:show,id:modificationTypeInstance.id)
-            }
-            else {
-                render(view:'edit',model:[modificationTypeInstance:modificationTypeInstance])
-            }
-        }
-        else {
-            flash.message = "ModificationType not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
-        }
-    }
-
-    def create = {
-        def modificationTypeInstance = new ModificationType()
-        modificationTypeInstance.properties = params
-        return ['modificationTypeInstance':modificationTypeInstance]
-    }
-
-    def save = {
-        def modificationTypeInstance = new ModificationType(params)
-        if(!modificationTypeInstance.hasErrors() && modificationTypeInstance.save()) {
-            flash.message = "ModificationType ${modificationTypeInstance.id} created"
-            redirect(action:show,id:modificationTypeInstance.id)
-        }
-        else {
-            render(view:'create',model:[modificationTypeInstance:modificationTypeInstance])
-        }
-    }
-}
Index: /trunk/src/grails-app/controllers/TaskModificationController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/TaskModificationController.groovy	(revision 93)
+++ /trunk/src/grails-app/controllers/TaskModificationController.groovy	(revision 93)
@@ -0,0 +1,99 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class TaskModificationController extends BaseController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskModificationInstanceList: TaskModification.list( params ), taskModificationInstanceTotal: TaskModification.count() ]
+    }
+
+    def show = {
+        def taskModificationInstance = TaskModification.get( params.id )
+
+        if(!taskModificationInstance) {
+            flash.message = "TaskModification not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskModificationInstance : taskModificationInstance ] }
+    }
+
+    def delete = {
+        def taskModificationInstance = TaskModification.get( params.id )
+        if(taskModificationInstance) {
+            try {
+                taskModificationInstance.delete()
+                flash.message = "TaskModification ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "TaskModification ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
+        }
+        else {
+            flash.message = "TaskModification not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def taskModificationInstance = TaskModification.get( params.id )
+
+        if(!taskModificationInstance) {
+            flash.message = "TaskModification not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ taskModificationInstance : taskModificationInstance ]
+        }
+    }
+
+    def update = {
+        def taskModificationInstance = TaskModification.get( params.id )
+        if(taskModificationInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskModificationInstance.version > version) {
+                    
+                    taskModificationInstance.errors.rejectValue("version", "taskModification.optimistic.locking.failure", "Another user has updated this TaskModification while you were editing.")
+                    render(view:'edit',model:[taskModificationInstance:taskModificationInstance])
+                    return
+                }
+            }
+            taskModificationInstance.properties = params
+            if(!taskModificationInstance.hasErrors() && taskModificationInstance.save()) {
+                flash.message = "TaskModification ${params.id} updated"
+                redirect(action:show,id:taskModificationInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskModificationInstance:taskModificationInstance])
+            }
+        }
+        else {
+            flash.message = "TaskModification not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def taskModificationInstance = new TaskModification()
+        taskModificationInstance.properties = params
+        return ['taskModificationInstance':taskModificationInstance]
+    }
+
+    def save = {
+        def taskModificationInstance = new TaskModification(params)
+        if(!taskModificationInstance.hasErrors() && taskModificationInstance.save()) {
+            flash.message = "TaskModification ${taskModificationInstance.id} created"
+            redirect(action:show,id:taskModificationInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskModificationInstance:taskModificationInstance])
+        }
+    }
+}
Index: /trunk/src/grails-app/controllers/TaskModificationTypeController.groovy
===================================================================
--- /trunk/src/grails-app/controllers/TaskModificationTypeController.groovy	(revision 93)
+++ /trunk/src/grails-app/controllers/TaskModificationTypeController.groovy	(revision 93)
@@ -0,0 +1,99 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+class TaskModificationTypeController extends BaseController {
+    
+    def index = { redirect(action:list,params:params) }
+
+    // the delete, save and update actions only accept POST requests
+    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
+
+    def list = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ taskModificationTypeInstanceList: TaskModificationType.list( params ), taskModificationTypeInstanceTotal: TaskModificationType.count() ]
+    }
+
+    def show = {
+        def taskModificationTypeInstance = TaskModificationType.get( params.id )
+
+        if(!taskModificationTypeInstance) {
+            flash.message = "TaskModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ taskModificationTypeInstance : taskModificationTypeInstance ] }
+    }
+
+    def delete = {
+        def taskModificationTypeInstance = TaskModificationType.get( params.id )
+        if(taskModificationTypeInstance) {
+            try {
+                taskModificationTypeInstance.delete()
+                flash.message = "TaskModificationType ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "TaskModificationType ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
+        }
+        else {
+            flash.message = "TaskModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+        def taskModificationTypeInstance = TaskModificationType.get( params.id )
+
+        if(!taskModificationTypeInstance) {
+            flash.message = "TaskModificationType not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ taskModificationTypeInstance : taskModificationTypeInstance ]
+        }
+    }
+
+    def update = {
+        def taskModificationTypeInstance = TaskModificationType.get( params.id )
+        if(taskModificationTypeInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(taskModificationTypeInstance.version > version) {
+                    
+                    taskModificationTypeInstance.errors.rejectValue("version", "taskModificationType.optimistic.locking.failure", "Another user has updated this TaskModificationType while you were editing.")
+                    render(view:'edit',model:[taskModificationTypeInstance:taskModificationTypeInstance])
+                    return
+                }
+            }
+            taskModificationTypeInstance.properties = params
+            if(!taskModificationTypeInstance.hasErrors() && taskModificationTypeInstance.save()) {
+                flash.message = "TaskModificationType ${params.id} updated"
+                redirect(action:show,id:taskModificationTypeInstance.id)
+            }
+            else {
+                render(view:'edit',model:[taskModificationTypeInstance:taskModificationTypeInstance])
+            }
+        }
+        else {
+            flash.message = "TaskModificationType not found with id ${params.id}"
+            redirect(action:edit,id:params.id)
+        }
+    }
+
+    def create = {
+        def taskModificationTypeInstance = new TaskModificationType()
+        taskModificationTypeInstance.properties = params
+        return ['taskModificationTypeInstance':taskModificationTypeInstance]
+    }
+
+    def save = {
+        def taskModificationTypeInstance = new TaskModificationType(params)
+        if(!taskModificationTypeInstance.hasErrors() && taskModificationTypeInstance.save()) {
+            flash.message = "TaskModificationType ${taskModificationTypeInstance.id} created"
+            redirect(action:show,id:taskModificationTypeInstance.id)
+        }
+        else {
+            render(view:'create',model:[taskModificationTypeInstance:taskModificationTypeInstance])
+        }
+    }
+}
Index: unk/src/grails-app/domain/Modification.groovy
===================================================================
--- /trunk/src/grails-app/domain/Modification.groovy	(revision 92)
+++ 	(revision )
@@ -1,19 +1,0 @@
-class Modification {
-    Person person
-    ModificationType modificationType
-    Task task
-    Date date = new Date()
-    String comment
-
-    static belongsTo = [Person, ModificationType, Task]
-
-    static constraints = {
-        person()
-        modificationType()
-        task()
-        date()
-        comment()
-    }
-
-    static optionals = ["comment"]
-}
Index: unk/src/grails-app/domain/ModificationType.groovy
===================================================================
--- /trunk/src/grails-app/domain/ModificationType.groovy	(revision 92)
+++ 	(revision )
@@ -1,14 +1,0 @@
-class ModificationType {
-    String name
-    String description = ""
-    boolean isActive = true
-
-    static hasMany = [modifications : Modification]
-
-    static constraints = {
-    }
-
-    String toString() {
-        "${this.name}"
-    }
-}
Index: /trunk/src/grails-app/domain/Person.groovy
===================================================================
--- /trunk/src/grails-app/domain/Person.groovy	(revision 92)
+++ /trunk/src/grails-app/domain/Person.groovy	(revision 93)
@@ -3,5 +3,5 @@
     static hasMany = [authorities: Authority,
                         personGroups: PersonGroup,
-                        modifications: Modification,
+                        taskModifications: TaskModification,
                         entries: Entry,
                         tasks: Task]
Index: /trunk/src/grails-app/domain/Task.groovy
===================================================================
--- /trunk/src/grails-app/domain/Task.groovy	(revision 92)
+++ /trunk/src/grails-app/domain/Task.groovy	(revision 93)
@@ -15,5 +15,5 @@
 
     static hasMany = [entries: Entry, 
-                        modifications: Modification, 
+                        taskModifications: TaskModification, 
                         assignedPersons: Person, 
                         subTasks: Task]
Index: /trunk/src/grails-app/domain/TaskModification.groovy
===================================================================
--- /trunk/src/grails-app/domain/TaskModification.groovy	(revision 93)
+++ /trunk/src/grails-app/domain/TaskModification.groovy	(revision 93)
@@ -0,0 +1,19 @@
+class TaskModification {
+    Person person
+    TaskModificationType taskModificationType
+    Task task
+    Date date = new Date()
+    String comment
+
+    static belongsTo = [Person, TaskModificationType, Task]
+
+    static constraints = {
+        person()
+        taskModificationType()
+        task()
+        date()
+        comment()
+    }
+
+    static optionals = ["comment"]
+}
Index: /trunk/src/grails-app/domain/TaskModificationType.groovy
===================================================================
--- /trunk/src/grails-app/domain/TaskModificationType.groovy	(revision 93)
+++ /trunk/src/grails-app/domain/TaskModificationType.groovy	(revision 93)
@@ -0,0 +1,14 @@
+class TaskModificationType {
+    String name
+    String description = ""
+    boolean isActive = true
+
+    static hasMany = [taskModifications : TaskModification]
+
+    static constraints = {
+    }
+
+    String toString() {
+        "${this.name}"
+    }
+}
Index: /trunk/src/grails-app/views/task/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/task/edit.gsp	(revision 92)
+++ /trunk/src/grails-app/views/task/edit.gsp	(revision 93)
@@ -153,14 +153,14 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="modifications">Modifications:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'modifications','errors')}">
-                                    
-<ul>
-<g:each var="m" in="${taskInstance?.modifications?}">
-    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-</g:each>
-</ul>
-<g:link controller="modification" params="['task.id':taskInstance?.id]" action="create">Add Modification</g:link>
+                                    <label for="taskModifications">Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskModifications','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${taskInstance?.taskModifications?}">
+    <li><g:link controller="taskModification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="taskModification" params="['task.id':taskInstance?.id]" action="create">Add Modification</g:link>
 
                                 </td>
Index: /trunk/src/grails-app/views/task/show.gsp
===================================================================
--- /trunk/src/grails-app/views/task/show.gsp	(revision 92)
+++ /trunk/src/grails-app/views/task/show.gsp	(revision 93)
@@ -125,6 +125,6 @@
                             <td  valign="top" style="text-align:left;" class="value">
                                 <ul>
-                                <g:each var="m" in="${taskInstance.modifications}">
-                                    <li><g:link controller="modification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                <g:each var="m" in="${taskInstance.taskModifications}">
+                                    <li><g:link controller="taskModification" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
                                 </g:each>
                                 </ul>
Index: /trunk/src/grails-app/views/taskModification/create.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModification/create.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModification/create.gsp	(revision 93)
@@ -0,0 +1,83 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create TaskModification</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModification List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create TaskModification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskModificationInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskModificationInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${taskModificationInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskModificationType">Task Modification Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'taskModificationType','errors')}">
+                                    <g:select optionKey="id" from="${TaskModificationType.list()}" name="taskModificationType.id" value="${taskModificationInstance?.taskModificationType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${taskModificationInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${taskModificationInstance?.date}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'comment','errors')}">
+                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:taskModificationInstance,field:'comment')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModification/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModification/edit.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModification/edit.gsp	(revision 93)
@@ -0,0 +1,87 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit TaskModification</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModification List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit TaskModification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskModificationInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskModificationInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskModificationInstance?.id}" />
+                <input type="hidden" name="version" value="${taskModificationInstance?.version}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="person">Person:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'person','errors')}">
+                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${taskModificationInstance?.person?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskModificationType">Task Modification Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'taskModificationType','errors')}">
+                                    <g:select optionKey="id" from="${TaskModificationType.list()}" name="taskModificationType.id" value="${taskModificationInstance?.taskModificationType?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="task">Task:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'task','errors')}">
+                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${taskModificationInstance?.task?.id}" ></g:select>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="date">Date:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${taskModificationInstance?.date}" ></g:datePicker>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="comment">Comment:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'comment','errors')}">
+                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:taskModificationInstance,field:'comment')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModification/list.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModification/list.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModification/list.gsp	(revision 93)
@@ -0,0 +1,64 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>TaskModification List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>TaskModification List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <th>Person</th>
+                   	    
+                   	        <th>Task Modification Type</th>
+                   	    
+                   	        <th>Task</th>
+                   	    
+                   	        <g:sortableColumn property="date" title="Date" />
+                        
+                   	        <g:sortableColumn property="comment" title="Comment" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskModificationInstanceList}" status="i" var="taskModificationInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${taskModificationInstance.id}">${fieldValue(bean:taskModificationInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:taskModificationInstance, field:'person')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationInstance, field:'taskModificationType')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationInstance, field:'task')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationInstance, field:'date')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationInstance, field:'comment')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${taskModificationInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModification/show.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModification/show.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModification/show.gsp	(revision 93)
@@ -0,0 +1,79 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show TaskModification</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModification List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModification</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show TaskModification</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Person:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="person" action="show" id="${taskModificationInstance?.person?.id}">${taskModificationInstance?.person?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Modification Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="taskModificationType" action="show" id="${taskModificationInstance?.taskModificationType?.id}">${taskModificationInstance?.taskModificationType?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${taskModificationInstance?.task?.id}">${taskModificationInstance?.task?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Date:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'date')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Comment:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'comment')}</td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskModificationInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModificationType/create.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModificationType/create.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModificationType/create.gsp	(revision 93)
@@ -0,0 +1,65 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create TaskModificationType</title>         
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModificationType List</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Create TaskModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskModificationTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskModificationTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:taskModificationTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskModificationTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:taskModificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModificationType/edit.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModificationType/edit.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModificationType/edit.gsp	(revision 93)
@@ -0,0 +1,85 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit TaskModificationType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModificationType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Edit TaskModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${taskModificationTypeInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${taskModificationTypeInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${taskModificationTypeInstance?.id}" />
+                <input type="hidden" name="version" value="${taskModificationTypeInstance?.version}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'description','errors')}">
+                                    <input type="text" id="description" name="description" value="${fieldValue(bean:taskModificationTypeInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${taskModificationTypeInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'name','errors')}">
+                                    <input type="text" id="name" name="name" value="${fieldValue(bean:taskModificationTypeInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="taskModifications">Task Modifications:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationTypeInstance,field:'taskModifications','errors')}">
+                                    
+<ul>
+<g:each var="t" in="${taskModificationTypeInstance?.taskModifications?}">
+    <li><g:link controller="taskModification" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="taskModification" params="['taskModificationType.id':taskModificationTypeInstance?.id]" action="create">Add TaskModification</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModificationType/list.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModificationType/list.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModificationType/list.gsp	(revision 93)
@@ -0,0 +1,56 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>TaskModificationType List</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>TaskModificationType List</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                   	        <g:sortableColumn property="id" title="Id" />
+                        
+                   	        <g:sortableColumn property="description" title="Description" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
+                   	        <g:sortableColumn property="name" title="Name" />
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${taskModificationTypeInstanceList}" status="i" var="taskModificationTypeInstance">
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
+                        
+                            <td><g:link action="show" id="${taskModificationTypeInstance.id}">${fieldValue(bean:taskModificationTypeInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:taskModificationTypeInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationTypeInstance, field:'isActive')}</td>
+                        
+                            <td>${fieldValue(bean:taskModificationTypeInstance, field:'name')}</td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${taskModificationTypeInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: /trunk/src/grails-app/views/taskModificationType/show.gsp
===================================================================
--- /trunk/src/grails-app/views/taskModificationType/show.gsp	(revision 93)
+++ /trunk/src/grails-app/views/taskModificationType/show.gsp	(revision 93)
@@ -0,0 +1,78 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show TaskModificationType</title>
+    </head>
+    <body>
+        <div class="nav">
+            <span class="menuButton"><a class="home" href="${createLinkTo(dir:'')}">Home</a></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModificationType List</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModificationType</g:link></span>
+        </div>
+        <div class="body">
+            <h1>Show TaskModificationType</h1>
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationTypeInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationTypeInstance, field:'description')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationTypeInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationTypeInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Task Modifications:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="t" in="${taskModificationTypeInstance.taskModifications}">
+                                    <li><g:link controller="taskModification" action="show" id="${t.id}">${t?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${taskModificationTypeInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
Index: unk/src/test/integration/EntryControllerTests.groovy
===================================================================
--- /trunk/src/test/integration/EntryControllerTests.groovy	(revision 92)
+++ 	(revision )
@@ -1,6 +1,0 @@
-class EntryControllerTests extends GroovyTestCase {
-
-    void testSomething() {
-
-    }
-}