Index: trunk/grails-app/controllers/AppCoreController.groovy
===================================================================
--- trunk/grails-app/controllers/AppCoreController.groovy	(revision 215)
+++ trunk/grails-app/controllers/AppCoreController.groovy	(revision 216)
@@ -17,5 +17,5 @@
     */
     def welcome = {
-        def personInstance = personService.currentUser()
+        def personInstance = personService.currentUser
         flash.message = "Welcome, ${personInstance.firstName} ${personInstance.lastName}."
 
@@ -30,9 +30,9 @@
     def changeSessionTimeout = {
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
             return [ personInstance : personInstance ]       
         }
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
                 personInstance.properties = params
                 if (!personInstance.hasErrors() && personInstance.save(flush: true)) {
@@ -53,10 +53,10 @@
 
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
             return [ personInstance : personInstance ]       
         }
 
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.confirmPass == params.pass) {
Index: trunk/grails-app/controllers/EntryDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/EntryDetailedController.groovy	(revision 215)
+++ trunk/grails-app/controllers/EntryDetailedController.groovy	(revision 216)
@@ -29,5 +29,5 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
                 def taskID = entryInstance.task.id
                 entryInstance.delete(flush:true)
@@ -55,5 +55,5 @@
         else {
 
-            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
                 return [ entryInstance : entryInstance ]
             }
@@ -70,5 +70,5 @@
         if(entryInstance) {
             // The update method only accepts post requests, so this is just in case.
-            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
                 entryInstance.properties = params
                 if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
Index: trunk/grails-app/controllers/TaskDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 215)
+++ trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 216)
@@ -28,5 +28,5 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -67,5 +67,5 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -112,5 +112,5 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "budgetUnplanned") {
@@ -416,5 +416,5 @@
 
         // Default leadPerson to current user, unless supplied in params.
-        taskInstance.leadPerson = personService.currentUser()
+        taskInstance.leadPerson = personService.currentUser
         taskInstance.properties = params
         return ['taskInstance': taskInstance]
Index: trunk/grails-app/services/PersonService.groovy
===================================================================
--- trunk/grails-app/services/PersonService.groovy	(revision 215)
+++ trunk/grails-app/services/PersonService.groovy	(revision 216)
@@ -13,5 +13,5 @@
     * @returns The current user or the 'system' person (Person #1) if userDomain() is not active.
     */
-    def currentUser() {
+    def getCurrentUser() {
         if(authenticateService.userDomain()) {
             return Person.get(authenticateService.userDomain().id)
Index: trunk/grails-app/services/TaskService.groovy
===================================================================
--- trunk/grails-app/services/TaskService.groovy	(revision 215)
+++ trunk/grails-app/services/TaskService.groovy	(revision 216)
@@ -46,5 +46,5 @@
 
             if(taskInstance.save()) {
-                def taskModification = new TaskModification(person: personService.currentUser(),
+                def taskModification = new TaskModification(person: personService.currentUser,
                                                         taskModificationType: TaskModificationType.get(1),
                                                         task: taskInstance)
@@ -119,5 +119,5 @@
             def result = [:]
             result.entryInstance = new Entry(params)
-            result.entryInstance.enteredBy = personService.currentUser()
+            result.entryInstance.enteredBy = personService.currentUser
 
             if(result.entryInstance.validate()) {
@@ -143,5 +143,5 @@
 
                     // Create the "Started" task modification, this provides the "Actual started date".
-                    def taskModification = new TaskModification(person: personService.currentUser(),
+                    def taskModification = new TaskModification(person: personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(2),
                                                             task: taskInstance)
@@ -215,5 +215,5 @@
                 return fail()
 
-            def taskModification = new TaskModification(person:personService.currentUser(),
+            def taskModification = new TaskModification(person:personService.currentUser,
                                                     taskModificationType: TaskModificationType.get(3),
                                                     task: result.taskInstance)
@@ -254,5 +254,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(4),
                                                             task: result.taskInstance)
@@ -303,5 +303,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(5),
                                                             task: result.taskInstance)
@@ -352,5 +352,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(6),
                                                             task: result.taskInstance)
@@ -400,5 +400,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(7),
                                                             task: result.taskInstance)
@@ -448,5 +448,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(8),
                                                             task: result.taskInstance)
@@ -496,5 +496,5 @@
 
                 if(result.taskInstance.save()) {
-                    def taskModification = new TaskModification(person:personService.currentUser(),
+                    def taskModification = new TaskModification(person:personService.currentUser,
                                                             taskModificationType: TaskModificationType.get(9),
                                                             task: result.taskInstance)
