Index: /trunk/grails-app/domain/Person.groovy
===================================================================
--- /trunk/grails-app/domain/Person.groovy	(revision 398)
+++ /trunk/grails-app/domain/Person.groovy	(revision 399)
@@ -26,7 +26,4 @@
     boolean isActive = true
 
-    String email
-    boolean emailShow = true
-
     /** description */
     String description = ''
@@ -42,6 +39,4 @@
         description()
         department(nullable:true)
-        email()
-        emailShow()
         isActive()
         //Enforcing minSize on password does not work since "" gets encoded to a string.
Index: /trunk/grails-app/services/CreateBulkDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateBulkDataService.groovy	(revision 398)
+++ /trunk/grails-app/services/CreateBulkDataService.groovy	(revision 399)
@@ -114,6 +114,5 @@
                                         lastName: lastName,
                                         pass: passClearText,
-                                        password: passwordEncoded,
-                                        email: "bulkTest@example.com")
+                                        password: passwordEncoded)
             saveAndTest(personInstance)
             personInstance.addToAuthorities(authority2)
Index: /trunk/grails-app/services/CreateDataService.groovy
===================================================================
--- /trunk/grails-app/services/CreateDataService.groovy	(revision 398)
+++ /trunk/grails-app/services/CreateDataService.groovy	(revision 399)
@@ -237,6 +237,5 @@
                                                         assign login authorities or change the details of this person.''',
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"system@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
     }
@@ -255,6 +254,5 @@
                                                         DO update the password and other details but keep the login name as 'admin'. ''',
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"admin@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(1))
@@ -278,6 +276,5 @@
                                     lastName:"Manager",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"manager@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(2))
@@ -290,6 +287,5 @@
                                     lastName:"User",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"user@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(3))
@@ -304,6 +300,5 @@
                                     lastName:"SuperSparky",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"user@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(3))
@@ -318,6 +313,5 @@
                                     lastName:"SuperFitter",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"user@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(3))
@@ -332,6 +326,5 @@
                                     lastName:"Mann",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"user@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(3))
@@ -344,6 +337,5 @@
                                     lastName:"Manager",
                                     pass:passClearText,
-                                    password:passwordEncoded,
-                                    email:"user@example.com")
+                                    password:passwordEncoded)
         saveAndTest(personInstance)
         personInstance.addToAuthorities(Authority.get(3))
Index: /trunk/grails-app/views/person/create.gsp
===================================================================
--- /trunk/grails-app/views/person/create.gsp	(revision 398)
+++ /trunk/grails-app/views/person/create.gsp	(revision 399)
@@ -77,18 +77,4 @@
 
                     <tr class="prop">
-                        <td valign="top" class="name"><label for="email">Email:</label></td>
-                        <td valign="top" class="value ${hasErrors(bean:person,field:'email','errors')}">
-                            <input type="text" id="email" name="email" value="${person.email?.encodeAsHTML()}"/>
-                        </td>
-                    </tr>
-
-                    <tr class="prop">
-                        <td valign="top" class="name"><label for="emailShow">Show Email:</label></td>
-                        <td valign="top" class="value ${hasErrors(bean:person,field:'emailShow','errors')}">
-                            <g:checkBox name="emailShow" value="${person.emailShow}"/>
-                        </td>
-                    </tr>
-
-                    <tr class="prop">
                         <td valign="top" class="name"><label for="employeeID">employee ID:</label></td>
                         <td valign="top" class="value ${hasErrors(bean:person,field:'employeeID','errors')}">
Index: /trunk/grails-app/views/person/edit.gsp
===================================================================
--- /trunk/grails-app/views/person/edit.gsp	(revision 398)
+++ /trunk/grails-app/views/person/edit.gsp	(revision 399)
@@ -84,18 +84,4 @@
 
                     <tr class="prop">
-                        <td valign="top" class="name"><label for="email">Email:</label></td>
-                        <td valign="top" class="value ${hasErrors(bean:person,field:'email','errors')}">
-                            <input type="text" id="email" name="email" value="${person?.email?.encodeAsHTML()}"/>
-                        </td>
-                    </tr>
-
-                    <tr class="prop">
-                        <td valign="top" class="name"><label for="emailShow">Show Email:</label></td>
-                        <td valign="top" class="value ${hasErrors(bean:person,field:'emailShow','errors')}">
-                            <g:checkBox name="emailShow" value="${person.emailShow}"/>
-                        </td>
-                    </tr>
-
-                    <tr class="prop">
                         <td valign="top" class="name">
                             <label for="addresses">Addresses:</label>
Index: /trunk/grails-app/views/person/list.gsp
===================================================================
--- /trunk/grails-app/views/person/list.gsp	(revision 398)
+++ /trunk/grails-app/views/person/list.gsp	(revision 399)
@@ -70,5 +70,5 @@
                                 action="list"
                                 class="overlayPane"
-                                excludeProperties="password, sessionTimeout, emailShow"
+                                excludeProperties="password, sessionTimeout"
                                 associatedProperties="authorities.authority, personGroups.name"
                                     filterPropertyValues="${['personGroups.name':[values:PersonGroup.list()],
Index: /trunk/grails-app/views/person/show.gsp
===================================================================
--- /trunk/grails-app/views/person/show.gsp	(revision 398)
+++ /trunk/grails-app/views/person/show.gsp	(revision 399)
@@ -47,14 +47,4 @@
                     <td valign="top" class="name">Description:</td>
                     <td valign="top" class="value">${person.description?.encodeAsHTML()}</td>
-                </tr>
-
-                <tr class="prop">
-                    <td valign="top" class="name">Email:</td>
-                    <td valign="top" class="value">${person.email?.encodeAsHTML()}</td>
-                </tr>
-
-                <tr class="prop">
-                    <td valign="top" class="name">Show Email:</td>
-                    <td valign="top" class="value">${person.emailShow}</td>
                 </tr>