Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml
===================================================================
diff -u -rc1324f6fe3e855aa13b8e8fc214e6d69ad109661 -rd883255ed6c431a263a24462714bb62cfa7c6fa2
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision c1324f6fe3e855aa13b8e8fc214e6d69ad109661)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolSession.hbm.xml	(.../ToolSession.hbm.xml)	(revision d883255ed6c431a263a24462714bb62cfa7c6fa2)
@@ -2,138 +2,72 @@
 <!DOCTYPE hibernate-mapping PUBLIC
     "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
-    
+
 <hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+	<!-- 
+		Created by the Middlegen Hibernate plugin 2.1
+		
+		http://boss.bekk.no/boss/middlegen/
+		http://www.hibernate.org/
+	-->
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
+	<class name="org.lamsfoundation.lams.tool.ToolSession"
+		table="lams_tool_session" discriminator-value="0">
+		<meta attribute="class-description" inherit="false">
+			@hibernate.class table="lams_tool_session"
+		</meta>
+		<meta attribute="implement-equals" inherit="false">true</meta>
 
-<class 
-    name="org.lamsfoundation.lams.tool.ToolSession" 
-    table="lams_tool_session"
->
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_tool_session"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
+		<id name="toolSessionId" type="java.lang.Long"
+			column="tool_session_id">
+			<meta attribute="field-description">
+				@hibernate.id generator-class="identity"
+				type="java.lang.Long" column="tool_session_id"
+			</meta>
+			<generator class="identity" />
+		</id>
 
-    <id
-        name="toolSessionId"
-        type="java.lang.Long"
-        column="tool_session_id"
-    >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="tool_session_id"
+		<discriminator column="tool_session_type_id" type="int" />
 
+		<property name="activityId" type="long" column="activity_id"
+			not-null="true" length="20">
+			<meta attribute="field-description">
+				@hibernate.property column="activity_id" length="20"
+				not-null="true"
+			</meta>
+		</property>
+		<property name="toolSessionKey" type="long"
+			column="tool_session_key" not-null="true" length="20">
+			<meta attribute="field-description">
+				@hibernate.property column="tool_session_key"
+				length="20" not-null="true"
+			</meta>
+		</property>
+		<property name="createDateTime" type="java.sql.Timestamp"
+			column="create_date_time" not-null="true" length="19">
+			<meta attribute="field-description">
+				@hibernate.property column="create_date_time"
+				length="19" not-null="true"
+			</meta>
+		</property>
 
-        </meta>
-        <generator class="identity" />
-    </id>
+		<property name="toolSessionStateId" type="int"
+			column="tool_session_state_id" />
 
-    <property
-        name="activityId"
-        type="long"
-        column="activity_id"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="activity_id"
-            length="20"
-            not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="toolSessionKey"
-        type="long"
-        column="tool_session_key"
-        not-null="true"
-        length="20"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="tool_session_key"
-            length="20"
-            not-null="true"
-        </meta>    
-    </property>
-    <property
-        name="createDateTime"
-        type="java.sql.Timestamp"
-        column="create_date_time"
-        not-null="true"
-        length="19"
-    >
-        <meta attribute="field-description">
-           @hibernate.property
-            column="create_date_time"
-            length="19"
-            not-null="true"
-        </meta>    
-    </property>
+		<subclass name="org.lamsfoundation.lams.tool.GroupedToolSession"
+			discriminator-value="1">
+			<many-to-one name="group"
+				class="org.lamsfoundation.lams.learningdesign.Group"
+				column="group_id" />
+		</subclass>
 
-    <!-- Associations -->
-  
-    <!-- bi-directional one-to-many association to UserToolSession -->
-    <!-- set
-        name="userToolSessions"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
-        <meta attribute="field-description">
-           @hibernate.set
-            lazy="true"
-            inverse="true"
-            cascade="none"
+		<subclass
+			name="org.lamsfoundation.lams.tool.NonGroupedToolSession"
+			discriminator-value="2">
+			<many-to-one name="user"
+				class="org.lamsfoundation.lams.usermanagement.User"
+				column="user_id" />
+		</subclass>
 
-           @hibernate.collection-key
-            column="tool_session_id"
-
-           @hibernate.collection-one-to-many
-            class="org.lamsfoundation.lams.lesson.UserToolSession"
-        </meta>
-        <key>
-            <column name="tool_session_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.lesson.UserToolSession"
-        />
-    </set-->
-    <!-- bi-directional many-to-one association to Group -->
-    <!-- many-to-one
-        name="group"
-        class="org.lamsfoundation.lams.learningdesign.Group"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="group_id"         
-        </meta>
-        <column name="group_id" />
-    </many-to-one-->
-    <!-- bi-directional many-to-one association to ToolSessionState -->
-    <many-to-one
-        name="toolSessionState"
-        class="org.lamsfoundation.lams.tool.ToolSessionState"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="tool_session_state_id"         
-        </meta>
-        <column name="tool_session_state_id" />
-    </many-to-one>
-
-</class>
+	</class>
 </hibernate-mapping>