Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	18 Nov 2005 04:42:32 -0000	1.7
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	24 Oct 2006 00:10:05 -0000	1.8
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-InstructionFiles.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmissionDetails.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	5 Sep 2006 04:05:23 -0000	1.7
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	24 Oct 2006 00:10:05 -0000	1.8
@@ -16,7 +16,7 @@
             column="submission_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmissionDetails.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	10 Oct 2005 04:41:20 -0000	1.4
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	24 Oct 2006 00:10:05 -0000	1.5
@@ -16,7 +16,7 @@
             column="report_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitFilesReport.xml 
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitUser.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	5 Sep 2006 04:57:28 -0000	1.2
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	24 Oct 2006 00:10:05 -0000	1.3
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitUser.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.hbm.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	18 Nov 2005 04:42:32 -0000	1.7
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml	24 Oct 2006 00:09:19 -0000	1.8
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-InstructionFiles.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.java,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	17 Sep 2006 06:27:55 -0000	1.9
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	24 Oct 2006 00:09:19 -0000	1.10
@@ -44,7 +44,7 @@
 	private String type;
 
 	/**
-     * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the uid.
 	 */
 	public Long getUid() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmissionDetails.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	5 Sep 2006 04:05:22 -0000	1.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml	24 Oct 2006 00:09:19 -0000	1.6
@@ -16,7 +16,7 @@
             column="submission_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmissionDetails.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java,v
diff -u -r1.15 -r1.16
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	17 Sep 2006 06:27:55 -0000	1.15
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	24 Oct 2006 00:09:19 -0000	1.16
@@ -74,7 +74,7 @@
 	public SubmissionDetails() {
 	}
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long"
+	 * @hibernate.id generator-class="native" type="java.lang.Long"
 	 *               column="submission_id"
 	 */
 	public Long getSubmissionID() {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesReport.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	10 Oct 2005 04:41:20 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml	24 Oct 2006 00:09:19 -0000	1.3
@@ -16,7 +16,7 @@
             column="report_id"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitFilesReport.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	17 Sep 2006 06:27:55 -0000	1.8
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	24 Oct 2006 00:09:19 -0000	1.9
@@ -66,7 +66,7 @@
     public SubmitFilesReport() {
 	}
     /** 
-     * @hibernate.id generator-class="identity" type="java.lang.Long" column="report_id"
+     * @hibernate.id generator-class="native" type="java.lang.Long" column="report_id"
      */
     public Long getReportID() {
         return this.reportID;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitUser.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	5 Sep 2006 04:57:29 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.hbm.xml	24 Oct 2006 00:09:19 -0000	1.3
@@ -16,7 +16,7 @@
             column="uid"
             type="java.lang.Long"
         >
-            <generator class="identity">
+            <generator class="native">
               <!--  
                   To add non XDoclet generator parameters, create a file named 
                   hibernate-generator-params-SubmitUser.xml 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java	17 Sep 2006 06:27:55 -0000	1.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitUser.java	24 Oct 2006 00:09:19 -0000	1.4
@@ -72,7 +72,7 @@
 	// Get / Set methods
 	//***********************************************************
 	/**
-	 * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid"
+	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 * @return Returns the learnerID.
 	 */
 	public Long getUid() {
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/Scribe.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	15 Sep 2006 03:09:53 -0000	1.1
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Scribe.hbm.xml	24 Oct 2006 00:10:23 -0000	1.2
@@ -70,7 +70,7 @@
 
         <property
             name="runOffline"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="run_offline"
@@ -79,7 +79,7 @@
 
         <property
             name="lockOnFinished"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="lock_on_finished"
@@ -88,15 +88,15 @@
 
         <property
             name="autoSelectScribe"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="auto_select_scribe"
         />
 
         <property
             name="reflectOnActivity"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="reflect_on_activity"
@@ -132,7 +132,7 @@
 
         <property
             name="contentInUse"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="content_in_use"
@@ -141,7 +141,7 @@
 
         <property
             name="defineLater"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="define_later"
@@ -195,6 +195,25 @@
 
         </set>
 
+        <set
+            name="scribeHeadings"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="scribe_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-Scribe.xml
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/ScribeHeading.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeHeading.hbm.xml	24 Oct 2006 00:10:23 -0000	1.1
@@ -0,0 +1,65 @@
+<?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
+>
+    <class
+        name="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+        table="tl_lascrb11_heading"
+    >
+
+        <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-ScribeHeading.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="headingText"
+            type="text"
+            update="true"
+            insert="true"
+            column="heading"
+        />
+
+        <many-to-one
+            name="scribe"
+            class="org.lamsfoundation.lams.tool.scribe.model.Scribe"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="displayOrder"
+            type="int"
+            update="true"
+            insert="true"
+            column="display_order"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ScribeHeading.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/ScribeReportEntry.hbm.xml,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeReportEntry.hbm.xml	24 Oct 2006 00:10:23 -0000	1.1
@@ -0,0 +1,70 @@
+<?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
+>
+    <class
+        name="org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry"
+        table="tl_lascrb11_report_entry"
+    >
+
+        <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-ScribeReportEntry.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="entryText"
+            type="text"
+            update="true"
+            insert="true"
+            column="entry_text"
+        />
+
+        <many-to-one
+            name="scribeHeading"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeHeading"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_heading_uid" 
+            />
+        </many-to-one>
+
+        <many-to-one
+            name="scribeSession"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeSession"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="scribe_session_uid" 
+            />
+        </many-to-one>
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-ScribeReportEntry.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/ScribeSession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	15 Sep 2006 03:09:53 -0000	1.1
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.hbm.xml	24 Oct 2006 00:10:23 -0000	1.2
@@ -100,6 +100,46 @@
 
         </set>
 
+        <set
+            name="scribeReportEntries"
+            lazy="true"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="scribe_session_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.scribe.model.ScribeReportEntry"
+            />
+
+        </set>
+
+        <many-to-one
+            name="appointedScribe"
+            class="org.lamsfoundation.lams.tool.scribe.model.ScribeUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+        >
+            <column
+                name="appointed_scribe_uid" 
+            />
+        </many-to-one>
+
+        <property
+            name="forceComplete"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="force_complete"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ScribeSession.xml
Index: lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/Attic/ScribeUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	15 Sep 2006 03:09:53 -0000	1.1
+++ lams_tool_scribe/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scribe/model/ScribeUser.hbm.xml	24 Oct 2006 00:10:23 -0000	1.2
@@ -63,7 +63,7 @@
 
         <property
             name="finishedActivity"
-            type="java.lang.Boolean"
+            type="boolean"
             update="true"
             insert="true"
             column="finishedActivity"
@@ -82,6 +82,22 @@
             />
         </many-to-one>
 
+        <property
+            name="reportApproved"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="report_approved"
+        />
+
+        <property
+            name="startedActivity"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="started_activity"
+        />
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-ScribeUser.xml