Index: trunk/src/grails-app/views/taskModification/create.gsp
===================================================================
--- trunk/src/grails-app/views/modification/create.gsp	(revision 89)
+++ trunk/src/grails-app/views/taskModification/create.gsp	(revision 93)
@@ -5,19 +5,19 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create Modification</title>         
+        <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">Modification List</g:link></span>
+            <span class="menuButton"><g:link class="list" action="list">TaskModification List</g:link></span>
         </div>
         <div class="body">
-            <h1>Create Modification</h1>
+            <h1>Create TaskModification</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
-            <g:hasErrors bean="${modificationInstance}">
+            <g:hasErrors bean="${taskModificationInstance}">
             <div class="errors">
-                <g:renderErrors bean="${modificationInstance}" as="list" />
+                <g:renderErrors bean="${taskModificationInstance}" as="list" />
             </div>
             </g:hasErrors>
@@ -31,6 +31,6 @@
                                     <label for="person">Person:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'person','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${modificationInstance?.person?.id}" ></g:select>
+                                <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> 
@@ -38,8 +38,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="modificationType">Modification Type:</label>
+                                    <label for="taskModificationType">Task Modification Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'modificationType','errors')}">
-                                    <g:select optionKey="id" from="${ModificationType.list()}" name="modificationType.id" value="${modificationInstance?.modificationType?.id}" ></g:select>
+                                <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> 
@@ -49,6 +49,6 @@
                                     <label for="task">Task:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'task','errors')}">
-                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${modificationInstance?.task?.id}" ></g:select>
+                                <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> 
@@ -58,6 +58,6 @@
                                     <label for="date">Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'date','errors')}">
-                                    <g:datePicker name="date" value="${modificationInstance?.date}" ></g:datePicker>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${taskModificationInstance?.date}" ></g:datePicker>
                                 </td>
                             </tr> 
@@ -67,6 +67,6 @@
                                     <label for="comment">Comment:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'comment','errors')}">
-                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:modificationInstance,field:'comment')}"/>
+                                <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> 
Index: trunk/src/grails-app/views/taskModification/edit.gsp
===================================================================
--- trunk/src/grails-app/views/modification/edit.gsp	(revision 89)
+++ trunk/src/grails-app/views/taskModification/edit.gsp	(revision 93)
@@ -5,24 +5,25 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Edit Modification</title>
+        <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">Modification List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Modification</g:link></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 Modification</h1>
+            <h1>Edit TaskModification</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
             </g:if>
-            <g:hasErrors bean="${modificationInstance}">
+            <g:hasErrors bean="${taskModificationInstance}">
             <div class="errors">
-                <g:renderErrors bean="${modificationInstance}" as="list" />
+                <g:renderErrors bean="${taskModificationInstance}" as="list" />
             </div>
             </g:hasErrors>
             <g:form method="post" >
-                <input type="hidden" name="id" value="${modificationInstance?.id}" />
+                <input type="hidden" name="id" value="${taskModificationInstance?.id}" />
+                <input type="hidden" name="version" value="${taskModificationInstance?.version}" />
                 <div class="dialog">
                     <table>
@@ -33,6 +34,6 @@
                                     <label for="person">Person:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'person','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="person.id" value="${modificationInstance?.person?.id}" ></g:select>
+                                <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> 
@@ -40,8 +41,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="modificationType">Modification Type:</label>
+                                    <label for="taskModificationType">Task Modification Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'modificationType','errors')}">
-                                    <g:select optionKey="id" from="${ModificationType.list()}" name="modificationType.id" value="${modificationInstance?.modificationType?.id}" ></g:select>
+                                <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> 
@@ -51,6 +52,6 @@
                                     <label for="task">Task:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'task','errors')}">
-                                    <g:select optionKey="id" from="${Task.list()}" name="task.id" value="${modificationInstance?.task?.id}" ></g:select>
+                                <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> 
@@ -60,6 +61,6 @@
                                     <label for="date">Date:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'date','errors')}">
-                                    <g:datePicker name="date" value="${modificationInstance?.date}" ></g:datePicker>
+                                <td valign="top" class="value ${hasErrors(bean:taskModificationInstance,field:'date','errors')}">
+                                    <g:datePicker name="date" value="${taskModificationInstance?.date}" ></g:datePicker>
                                 </td>
                             </tr> 
@@ -69,6 +70,6 @@
                                     <label for="comment">Comment:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:modificationInstance,field:'comment','errors')}">
-                                    <input type="text" id="comment" name="comment" value="${fieldValue(bean:modificationInstance,field:'comment')}"/>
+                                <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> 
Index: trunk/src/grails-app/views/taskModification/list.gsp
===================================================================
--- trunk/src/grails-app/views/modification/list.gsp	(revision 89)
+++ trunk/src/grails-app/views/taskModification/list.gsp	(revision 93)
@@ -5,13 +5,13 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Modification List</title>
+        <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 Modification</g:link></span>
+            <span class="menuButton"><g:link class="create" action="create">New TaskModification</g:link></span>
         </div>
         <div class="body">
-            <h1>Modification List</h1>
+            <h1>TaskModification List</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -26,5 +26,5 @@
                    	        <th>Person</th>
                    	    
-                   	        <th>Modification Type</th>
+                   	        <th>Task Modification Type</th>
                    	    
                    	        <th>Task</th>
@@ -37,18 +37,18 @@
                     </thead>
                     <tbody>
-                    <g:each in="${modificationInstanceList}" status="i" var="modificationInstance">
+                    <g:each in="${taskModificationInstanceList}" status="i" var="taskModificationInstance">
                         <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
                         
-                            <td><g:link action="show" id="${modificationInstance.id}">${fieldValue(bean:modificationInstance, field:'id')}</g:link></td>
+                            <td><g:link action="show" id="${taskModificationInstance.id}">${fieldValue(bean:taskModificationInstance, field:'id')}</g:link></td>
                         
-                            <td>${fieldValue(bean:modificationInstance, field:'person')}</td>
+                            <td>${fieldValue(bean:taskModificationInstance, field:'person')}</td>
                         
-                            <td>${fieldValue(bean:modificationInstance, field:'modificationType')}</td>
+                            <td>${fieldValue(bean:taskModificationInstance, field:'taskModificationType')}</td>
                         
-                            <td>${fieldValue(bean:modificationInstance, field:'task')}</td>
+                            <td>${fieldValue(bean:taskModificationInstance, field:'task')}</td>
                         
-                            <td>${fieldValue(bean:modificationInstance, field:'date')}</td>
+                            <td>${fieldValue(bean:taskModificationInstance, field:'date')}</td>
                         
-                            <td>${fieldValue(bean:modificationInstance, field:'comment')}</td>
+                            <td>${fieldValue(bean:taskModificationInstance, field:'comment')}</td>
                         
                         </tr>
@@ -58,5 +58,5 @@
             </div>
             <div class="paginateButtons">
-                <g:paginate total="${Modification.count()}" />
+                <g:paginate total="${taskModificationInstanceTotal}" />
             </div>
         </div>
Index: trunk/src/grails-app/views/taskModification/show.gsp
===================================================================
--- trunk/src/grails-app/views/modification/show.gsp	(revision 89)
+++ trunk/src/grails-app/views/taskModification/show.gsp	(revision 93)
@@ -5,14 +5,14 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Show Modification</title>
+        <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">Modification List</g:link></span>
-            <span class="menuButton"><g:link class="create" action="create">New Modification</g:link></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 Modification</h1>
+            <h1>Show TaskModification</h1>
             <g:if test="${flash.message}">
             <div class="message">${flash.message}</div>
@@ -26,5 +26,5 @@
                             <td valign="top" class="name">Id:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'id')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'id')}</td>
                             
                         </tr>
@@ -33,12 +33,12 @@
                             <td valign="top" class="name">Person:</td>
                             
-                            <td valign="top" class="value"><g:link controller="person" action="show" id="${modificationInstance?.person?.id}">${modificationInstance?.person?.encodeAsHTML()}</g:link></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">Modification Type:</td>
+                            <td valign="top" class="name">Task Modification Type:</td>
                             
-                            <td valign="top" class="value"><g:link controller="modificationType" action="show" id="${modificationInstance?.modificationType?.id}">${modificationInstance?.modificationType?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value"><g:link controller="taskModificationType" action="show" id="${taskModificationInstance?.taskModificationType?.id}">${taskModificationInstance?.taskModificationType?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -47,5 +47,5 @@
                             <td valign="top" class="name">Task:</td>
                             
-                            <td valign="top" class="value"><g:link controller="task" action="show" id="${modificationInstance?.task?.id}">${modificationInstance?.task?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value"><g:link controller="task" action="show" id="${taskModificationInstance?.task?.id}">${taskModificationInstance?.task?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -54,5 +54,5 @@
                             <td valign="top" class="name">Date:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'date')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'date')}</td>
                             
                         </tr>
@@ -61,5 +61,5 @@
                             <td valign="top" class="name">Comment:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:modificationInstance, field:'comment')}</td>
+                            <td valign="top" class="value">${fieldValue(bean:taskModificationInstance, field:'comment')}</td>
                             
                         </tr>
@@ -70,5 +70,5 @@
             <div class="buttons">
                 <g:form>
-                    <input type="hidden" name="id" value="${modificationInstance?.id}" />
+                    <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>
