Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r972362fd3b15f3887b276091d6731b78d2d1296a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml	(.../TaskListItem.hbm.xml)	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -110,6 +110,14 @@
         />
 
         <property
+            name="showCommentsToAll"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="show_comments_to_all"
+        />
+
+        <property
             name="commentsAllowed"
             type="boolean"
             update="true"
@@ -133,6 +141,25 @@
             column="parent_task_name"
         />
 
+        <set
+            name="uploadedFileList"
+            lazy="false"
+            inverse="false"
+            cascade="all-delete-orphan"
+            sort="unsorted"
+        >
+
+            <key
+                column="taskList_item_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment"
+            />
+
+        </set>
+
         <!--
             To add non XDoclet property mappings, create a file named
                 hibernate-properties-TaskListItem.xml
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java
===================================================================
diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r972362fd3b15f3887b276091d6731b78d2d1296a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java	(.../TaskListItem.java)	(revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java	(.../TaskListItem.java)	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -25,6 +25,7 @@
 
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.log4j.Logger;
 
@@ -66,7 +67,7 @@
 	//DTO fields:
 	private boolean complete;
 	
-	private List<TaskListItemAttachment> uploadedFileList;
+	private Set uploadedFileList;
 	private List<TaskListItemComment> comments;
 	
     public Object clone(){
@@ -267,10 +268,20 @@
 			this.parentTaskName = parentTaskName;
 		}
 		
-		public List<TaskListItemAttachment> getUploadedFileList() {
+		/**
+	     *
+	     * @hibernate.set   cascade="all-delete-orphan"
+	     * 					inverse="false"
+	     * @hibernate.collection-key column="taskList_item_uid"
+	     * @hibernate.collection-one-to-many
+	     * 			class="org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment"
+	     *
+	     * @return a set of Attachments to this TaskListItem.
+	     */
+		public Set getUploadedFileList() {
 			return uploadedFileList;
 		}
-		public void setUploadedFileList(List<TaskListItemAttachment> uploadedFileList) {
+		public void setUploadedFileList(Set uploadedFileList) {
 			this.uploadedFileList = uploadedFileList;
 		}
 		
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -0,0 +1,84 @@
+<?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.taskList.model.TaskListItemAttachment"
+        table="tl_latask10_item_attachment"
+    >
+
+        <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-TaskListItemAttachment.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="fileVersionId"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="file_version_id"
+        />
+
+        <property
+            name="fileType"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="file_type"
+        />
+
+        <property
+            name="fileName"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="file_name"
+        />
+
+        <property
+            name="fileUuid"
+            type="java.lang.Long"
+            update="true"
+            insert="true"
+            column="file_uuid"
+        />
+
+        <property
+            name="created"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="create_date"
+        />
+
+        <property
+            name="createBy"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="create_by"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-TaskListItemAttachment.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml
===================================================================
diff -u
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml	(revision 0)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -0,0 +1,72 @@
+<?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.taskList.model.TaskListItemComment"
+        table="tl_latask10_item_comment"
+    >
+
+        <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-TaskListItemComment.xml 
+                  containing the additional parameters and place it in your merge dir. 
+              --> 
+            </generator>
+        </id>
+
+        <property
+            name="createDate"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="create_date"
+        />
+
+        <many-to-one
+            name="taskListItem"
+            class="org.lamsfoundation.lams.tool.taskList.model.TaskListItem"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="taskList_item_uid"
+        />
+
+        <many-to-one
+            name="createBy"
+            class="org.lamsfoundation.lams.tool.taskList.model.TaskListUser"
+            cascade="none"
+            outer-join="auto"
+            update="true"
+            insert="true"
+            column="create_by"
+        />
+
+        <property
+            name="comment"
+            type="java.lang.String"
+            update="true"
+            insert="true"
+            column="comment"
+        />
+
+        <!--
+            To add non XDoclet property mappings, create a file named
+                hibernate-properties-TaskListItemComment.xml
+            containing the additional properties and place it in your merge dir.
+        -->
+
+    </class>
+
+</hibernate-mapping>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
===================================================================
diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r972362fd3b15f3887b276091d6731b78d2d1296a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java	(.../ITaskListService.java)	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -242,5 +242,7 @@
 	 * @return
 	 */
 	TaskListUser getUser(Long uid);
+	
+	public void saveOrUpdateTaskListItem(TaskListItem item);
 }
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r972362fd3b15f3887b276091d6731b78d2d1296a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml	(.../taskListApplicationContext.xml)	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -22,6 +22,7 @@
                <value>org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml</value>
+               <value>org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/taskList/model/TaskListAttachment.hbm.xml</value>
                <value>org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml</value>
             </list>
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ViewItemAction.java
===================================================================
diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r972362fd3b15f3887b276091d6731b78d2d1296a
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ViewItemAction.java	(.../ViewItemAction.java)	(revision 972362fd3b15f3887b276091d6731b78d2d1296a)
@@ -157,7 +157,7 @@
 		
 		//init taskList item list
 		SortedSet<TaskListItemAttachment> attachmentList = getAttachmentList(sessionMap);
-		List<TaskListItemAttachment> dbAttachments = item.getUploadedFileList();
+		Set<TaskListItemAttachment> dbAttachments = item.getUploadedFileList();
 		attachmentList.clear();
 		if(dbAttachments != null){
 			for(TaskListItemAttachment comment : dbAttachments){
@@ -276,18 +276,16 @@
 		
 		
 		//finally persist taskListPO again
-		TaskListItem item = (TaskListItem) sessionMap.get(TaskListConstants.ATTR_TASK_LIST_ITEM);
-		List<TaskListItemAttachment> dbAttachments = item.getUploadedFileList();
+		TaskListItem httpSessionItem = (TaskListItem) sessionMap.get(TaskListConstants.ATTR_TASK_LIST_ITEM);
+		TaskListItem dbItem = service.getTaskListItemByUid(httpSessionItem.getUid());
+		Set<TaskListItemAttachment> dbAttachments = dbItem.getUploadedFileList();
 		if(dbAttachments == null){
-			dbAttachments = new ArrayList<TaskListItemAttachment>();
-			item.setUploadedFileList(dbAttachments);
+			dbAttachments = new HashSet<TaskListItemAttachment>();
+			dbItem.setUploadedFileList(dbAttachments);
 		}
 		dbAttachments.add(att);
-		
-		//save content to DB
-		TaskList taskList = service.getTaskListBySessionId(sessionId);
-		service.saveOrUpdateTaskList(taskList);
-		
+		service.saveOrUpdateTaskListItem(dbItem);
+				
 		form.reset(mapping, request);
 		
 		return mapping.findForward(TaskListConstants.SUCCESS);