Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -rdce659b59eb25956ec196310c7aa8eeaba6a6beb
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml	(.../NoticeboardAttachment.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml	(.../NoticeboardAttachment.hbm.xml)	(revision dce659b59eb25956ec196310c7aa8eeaba6a6beb)
@@ -1,116 +1,88 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-    
-<hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
-
-<class 
-    name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment" 
-    table="tl_lanb11_attachment"
+<hibernate-mapping
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
+    <class
+        name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment"
         table="tl_lanb11_attachment"
-    </meta>
-
-    <id
-        name="attachmentId"
-        type="java.lang.Long"
-        column="attachment_id"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
+
+        <id
+            name="attachmentId"
             column="attachment_id"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-NoticeboardAttachment.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
 
-
-        </meta>
-        <generator class="native" />
-    </id>
-
-    <property
-        name="filename"
-        type="java.lang.String"
-        column="filename"
-        not-null="true"
-        length="255"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        <property
+            name="filename"
+            type="java.lang.String"
+            update="true"
+            insert="true"
             column="filename"
             length="255"
             not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="uuid"
-        type="java.lang.Long"
-        column="uuid"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="uuid"
-            not-null="true"
-            length="20"
-        </meta>    
-    </property>
-    <property
-        name="versionId"
-        type="java.lang.Long"
-        column="version_id"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="version_id"
-            length="20"
-        </meta>    
-    </property>
-    <property
-        name="onlineFile"
-        type="boolean"
-        column="online_file"
-        not-null="true"
-        length="1"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="onlineFile"
+            type="boolean"
+            update="true"
+            insert="true"
             column="online_file"
             length="1"
             not-null="true"
-        </meta>    
-    </property>
+        />
 
-    <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to NoticeboardContent -->
-    <many-to-one
-        name="nbContent"
-        class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
-        not-null="true"
-        cascade="none"
-        outer-join="auto"
-        update="true"
-        insert="true"
-        access="property"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
+        <many-to-one
+            name="nbContent"
+            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="nb_content_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="uuid"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="uuid"
+            length="20"
             not-null="true"
-           @hibernate.column name="nb_content_uid"         
-        </meta>
-        <column name="nb_content_uid" />
-    </many-to-one>
+        />
 
-</class>
+        <property
+            name="versionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="version_id"
+            length="20"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-NoticeboardAttachment.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
 </hibernate-mapping>
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -rdce659b59eb25956ec196310c7aa8eeaba6a6beb
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	(.../NoticeboardContent.hbm.xml)	(revision dce659b59eb25956ec196310c7aa8eeaba6a6beb)
@@ -1,236 +1,175 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-    
-<hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
-
-<class 
-    name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent" 
-    table="tl_lanb11_content"
+<hibernate-mapping
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
+    <class
+        name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
         table="tl_lanb11_content"
-    </meta>
-
-    <id
-        name="uid"
-        type="java.lang.Long"
-        column="uid"
-        unsaved-value="0"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
+
+        <id
+            name="uid"
             column="uid"
+            type="java.lang.Long"
             unsaved-value="0"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-NoticeboardContent.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
 
-
-        </meta>
-        <generator class="native" />
-    </id>
-
-    <property
-        name="nbContentId"
-        type="java.lang.Long"
-        column="nb_content_id"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="nb_content_id"
-            length="20"
-            not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="title"
-        type="java.lang.String"
-        column="title"
-        
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="title"
-            length="255"
-        </meta>    
-    </property>
-    <property
-        name="content"
-        type="java.lang.String"
-        column="content"
-        
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        <property
+            name="content"
+            type="java.lang.String"
+            update="true"
+            insert="true"
             column="content"
             length="65535"
-        </meta>    
-    </property>
-    <property
-        name="onlineInstructions"
-        type="java.lang.String"
-        column="online_instructions"
-        
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="online_instructions"
-            length="65535"
-        </meta>    
-    </property>
-    <property
-        name="offlineInstructions"
-        type="java.lang.String"
-        column="offline_instructions"
-       
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="offline_instructions"
-            length="65535"
-        </meta>    
-    </property>
-    <property
-        name="defineLater"
-        type="boolean"
-        column="define_later"
-        length="1"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="define_later"
-            length="1"
-        </meta>    
-    </property>
-    <property
-        name="forceOffline"
-        type="boolean"
-        column="force_offline"
-        length="1"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="force_offline"
-            length="1"
-        </meta>    
-    </property>
-    
-     <property
-        name="contentInUse"
-        type="boolean"
-        column="content_in_use"
-        length="1"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="contentInUse"
-            length="1"
-        </meta>    
-    </property>
-    
-    <property
-        name="creatorUserId"
-        type="java.lang.Long"
-        column="creator_user_id"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="creatorUserId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
             column="creator_user_id"
             length="20"
-        </meta>    
-    </property>
-    <property
-        name="dateCreated"
-        type="java.sql.Timestamp"
-        column="date_created"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="dateCreated"
+            type="java.util.Date"
+            update="true"
+            insert="true"
             column="date_created"
             length="19"
-        </meta>    
-    </property>
-    <property
-        name="dateUpdated"
-        type="java.sql.Timestamp"
-        column="date_updated"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="dateUpdated"
+            type="java.util.Date"
+            update="true"
+            insert="true"
             column="date_updated"
             length="19"
-        </meta>    
-    </property>
+        />
 
-    <!-- Associations -->
-  
-    <!-- bi-directional one-to-many association to NoticeboardSession -->
-    <set
-        name="nbSessions"
-        lazy="true"
-        inverse="true"
-		cascade="all-delete-orphan"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
+        <property
+            name="defineLater"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="define_later"
+            length="1"
+        />
+
+        <property
+            name="forceOffline"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="force_offline"
+            length="1"
+        />
+
+        <property
+            name="contentInUse"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="content_in_use"
+            length="1"
+        />
+
+        <property
+            name="nbContentId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="nb_content_id"
+            length="20"
+            not-null="true"
+        />
+
+        <set
+            name="nbSessions"
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
+            sort="unsorted"
+        >
 
-           @hibernate.collection-key
-            column="nb_content_uid"
+            <key
+                column="nb_content_uid"
+            >
+            </key>
 
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
-        </meta>
-        <key>
-            <column name="nb_content_uid" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
-        />
-    </set>
-    
-    <!-- bi-directional one-to-many association to TlLanb11Attachment -->
-    <set
-        name="nbAttachments"
-        lazy="true"
-        inverse="true"
-		cascade="all-delete-orphan"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
+            />
+
+        </set>
+
+        <set
+            name="nbAttachments"
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
+            sort="unsorted"
+        >
 
-           @hibernate.collection-key
-            column="nb_content_uid"
+            <key
+                column="nb_content_uid"
+            >
+            </key>
 
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment"
-        </meta>
-        <key>
-            <column name="nb_content_uid" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment"
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment"
+            />
+
+        </set>
+
+        <property
+            name="offlineInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="offline_instructions"
+            length="65535"
         />
-    </set>
-    
 
-</class>
+        <property
+            name="onlineInstructions"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="online_instructions"
+            length="65535"
+        />
+
+        <property
+            name="title"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="title"
+            length="65535"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-NoticeboardContent.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
 </hibernate-mapping>
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -rdce659b59eb25956ec196310c7aa8eeaba6a6beb
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	(.../NoticeboardSession.hbm.xml)	(revision dce659b59eb25956ec196310c7aa8eeaba6a6beb)
@@ -1,142 +1,116 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-    
-<hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
-
-<class 
-    name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession" 
-    table="tl_lanb11_session"
+<hibernate-mapping
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
+    <class
+        name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
         table="tl_lanb11_session"
-    </meta>
-
-    <id
-        name="uid"
-        type="java.lang.Long"
-        column="uid"
-        unsaved-value="0"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
+
+        <id
+            name="uid"
             column="uid"
+            type="java.lang.Long"
             unsaved-value="0"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-NoticeboardSession.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
 
+        <many-to-one
+            name="nbContent"
+            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="nb_content_uid" 
+            />
+        </many-to-one>
 
-        </meta>
-        <generator class="native" />
-    </id>
-
-    <property
-        name="nbSessionId"
-        type="java.lang.Long"
-        column="nb_session_id"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        <property
+            name="nbSessionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
             column="nb_session_id"
             length="20"
             not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="sessionStartDate"
-        type="java.sql.Timestamp"
-        column="session_start_date"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="session_start_date"
-            length="19"
-        </meta>    
-    </property>
-    <property
-        name="sessionEndDate"
-        type="java.sql.Timestamp"
-        column="session_end_date"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="nbSessionName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="nb_session_name"
+            length="255"
+            not-null="true"
+        />
+
+        <property
+            name="sessionEndDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
             column="session_end_date"
             length="19"
-        </meta>    
-    </property>
-    <property
-        name="sessionStatus"
-        type="java.lang.String"
-        column="session_status"
-        length="100"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="sessionStartDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="session_start_date"
+            length="19"
+        />
+
+        <property
+            name="sessionStatus"
+            type="java.lang.String"
+            update="true"
+            insert="true"
             column="session_status"
             length="100"
-        </meta>    
-    </property>
+        />
 
-    <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to NoticeboardContent -->
-    <many-to-one
-        name="nbContent"
-        class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent"
-        not-null="true"
-        cascade="none"
-        outer-join="auto"
-        update="true"
-        insert="true"
-        access="property"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="nb_content_uid"         
-        </meta>
-        <column name="nb_content_uid" />
-    </many-to-one>
-    
-    <!-- bi-directional one-to-many association to NoticeboardUser -->
-    <set
-        name="nbUsers"
-        lazy="true"
-        inverse="true"
-		cascade="all-delete-orphan"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
+        <set
+            name="nbUsers"
             lazy="true"
             inverse="true"
             cascade="all-delete-orphan"
+            sort="unsorted"
+        >
 
-           @hibernate.collection-key
-            column="nb_session_uid"
+            <key
+                column="nb_session_uid"
+            >
+            </key>
 
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser"
-        </meta>
-        <key>
-            <column name="nb_session_uid" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser"
-        />
-    </set>
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser"
+            />
 
-	
-</class>
+        </set>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-NoticeboardSession.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
 </hibernate-mapping>
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml
===================================================================
diff -u -r6e5832d17263bc6c6f7683733e91e22f97eab569 -rdce659b59eb25956ec196310c7aa8eeaba6a6beb
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	(.../NoticeboardUser.hbm.xml)	(revision 6e5832d17263bc6c6f7683733e91e22f97eab569)
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	(.../NoticeboardUser.hbm.xml)	(revision dce659b59eb25956ec196310c7aa8eeaba6a6beb)
@@ -1,112 +1,86 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
-    
-<hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
-
-<class 
-    name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser" 
-    table="tl_lanb11_user"
+<hibernate-mapping
 >
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
+    <class
+        name="org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser"
         table="tl_lanb11_user"
-    </meta>
-
-    <id
-        name="uid"
-        type="java.lang.Long"
-        column="uid"
     >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="native"
-            type="java.lang.Long"
+
+        <id
+            name="uid"
             column="uid"
+            type="java.lang.Long"
+        >
+            <generator class="native">
+              <!--  
+                  To add non XDoclet generator parameters, create a file named 
+                  hibernate-generator-params-NoticeboardUser.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
 
+        <property
+            name="fullname"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="fullname"
+            length="50"
+        />
 
-        </meta>
-        <generator class="native" />
-    </id>
+        <many-to-one
+            name="nbSession"
+            class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="nb_session_uid" 
+            />
+        </many-to-one>
 
-    <property
-        name="userId"
-        type="java.lang.Long"
-        column="user_id"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        <property
+            name="userId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
             column="user_id"
             length="20"
             not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="username"
-        type="java.lang.String"
-        column="username"
-        length="50"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="username"
+            type="java.lang.String"
+            update="true"
+            insert="true"
             column="username"
             length="50"
-        </meta>    
-    </property>
-    <property
-        name="fullname"
-        type="java.lang.String"
-        column="fullname"
-        length="50"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="fullname"
-            length="50"
-        </meta>    
-    </property>
-    <property
-        name="userStatus"
-        type="java.lang.String"
-        column="user_status"
-        length="50"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
+        />
+
+        <property
+            name="userStatus"
+            type="java.lang.String"
+            update="true"
+            insert="true"
             column="user_status"
             length="50"
-        </meta>    
-    </property>
+        />
 
-    <!-- Associations -->
-  
-    <!-- bi-directional many-to-one association to TlLanb11Session -->
-    <many-to-one
-        name="nbSession"
-        class="org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession"
-        not-null="true"
-        cascade="none"
-        outer-join="auto"
-        update="true"
-        insert="true"
-        access="property"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="nb_session_uid"         
-        </meta>
-        <column name="nb_session_uid" />
-    </many-to-one>
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-NoticeboardUser.xml
+            containing the additional properties and place it in your merge dir.
+        -->
 
-</class>
+    </class>
+
 </hibernate-mapping>