Index: lams_tool_task/db/model/taskList.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/db/model/taskList.clay,v
diff -u -r1.6 -r1.7
Binary files differ
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/db/sql/create_lams_tool_taskList.sql,v
diff -u -r1.7 -r1.8
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql	2 Apr 2008 05:07:56 -0000	1.7
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql	8 Apr 2008 05:31:25 -0000	1.8
@@ -124,7 +124,7 @@
 alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
 alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_taskList (uid);
 alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_1 (condition_uid), add constraint FK_tl_latask10_taskList_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid);
-alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList (uid);
+alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList_item (uid);
 alter table tl_latask10_taskList add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid);
 alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid);
 alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java,v
diff -u -r1.5 -r1.6
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	7 Apr 2008 07:33:31 -0000	1.5
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	8 Apr 2008 05:31:25 -0000	1.6
@@ -465,8 +465,7 @@
      * 					inverse="false"
      * 					order-by="sequence_id asc"
      * @hibernate.collection-key column="taskList_uid"
-     * @hibernate.collection-one-to-many
-     * 			class="org.lamsfoundation.lams.tool.taskList.model.TaskListCondition"
+     * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListCondition"
      */
 	public Set getConditions() {
 		return conditions;
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/Attic/TaskListCondition.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	2 Apr 2008 05:07:56 -0000	1.1
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	8 Apr 2008 05:31:25 -0000	1.2
@@ -40,11 +40,10 @@
             inverse="true"
             cascade="none"
             sort="unsorted"
-            order-by="sequence_id asc"
         >
 
             <key
-                column="uid"
+                column="condition_uid"
             >
             </key>
 
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java,v
diff -u -r1.1 -r1.2
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	2 Apr 2008 05:07:56 -0000	1.1
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	8 Apr 2008 05:31:25 -0000	1.2
@@ -192,9 +192,8 @@
 	 * @hibernate.set lazy="true"
 	 * 				  inverse="true"
 	 * 				  cascade="none"
-	 *                order-by="sequence_id asc"
      * 				  table = "tl_latask10_condition_taskList_item"
-     * @hibernate.collection-key column="uid"
+     * @hibernate.collection-key column="condition_uid"
      * @hibernate.collection-many-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListItem"
 	 */
 	public Set getTaskListItems() {