Index: lams_monitoring/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/build.xml,v
diff -u -r1.10 -r1.11
--- lams_monitoring/build.xml	14 Sep 2005 07:00:14 -0000	1.10
+++ lams_monitoring/build.xml	6 Oct 2005 06:42:13 -0000	1.11
@@ -127,12 +127,14 @@
 				<include name="*.xml"/>
 				<include name="struts/*"/>
 				<include name="jstl/*"/>
-				<include name="spring/*"/>
 				<exclude name="web.xml"/>
 			</webinf>
-			<classes dir="${build.classes.java}"/>
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
+				<include name="css/*"/>
+				<include name="gate/*"/>
+				<include name="images/*"/>
+				<include name="template/*"/>
 			</fileset>
 		</war>
 	</target>
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.18 -r1.19
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	6 Jul 2005 01:57:10 -0000	1.18
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	6 Oct 2005 06:41:35 -0000	1.19
@@ -88,7 +88,10 @@
     
     /**
      * Set the gate to open to let all the learners through. This learning service
-     * is triggerred by the system scheduler.
+     * is triggerred by the system scheduler. Will return true GateActivity (or subclass)
+     * object, rather than a hibernate proxy. This is needed so that the class can 
+     * be returned to the web layer for proper handling.
+     * 
      * @param gate the id of the gate we need to open.
      */
     public GateActivity openGate(Long gateId);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java,v
diff -u -r1.4 -r1.5
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	20 Apr 2005 02:13:00 -0000	1.4
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java	6 Oct 2005 06:41:35 -0000	1.5
@@ -77,7 +77,7 @@
  * @struts.action-exception key="error.system.monitor" scope="request"
  *                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
  *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+ * 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="viewSynchGate" path=".viewSynchGate"
  * @struts:action-forward name="viewPermissionGate" path=".viewPermissionGate"
  * @struts:action-forward name="viewScheduleGate" path=".viewScheduleGate"
@@ -144,12 +144,14 @@
     {
         DynaActionForm gateForm = (DynaActionForm)form;
         
+        long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
+
+        Long gateIdLong = (Long)gateForm.get("activityId");
+        long gateId = WebUtil.checkLong("activityId", gateIdLong);
+        
         this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext());
         this.learnerService = MonitoringServiceProxy.getLearnerService(getServlet().getServletContext());
         
-        long gateId = ((Long)gateForm.get("activityId")).longValue();
-        long lessonId = WebUtil.readLongParam(request,PARAM_LESSON_ID);
-        
         Activity gate = monitoringService.getActivityById(gateId);
         
         //setup the total learners
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	6 Jul 2005 01:57:53 -0000	1.5
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	6 Oct 2005 06:41:35 -0000	1.6
@@ -57,7 +57,7 @@
  * @struts.action-exception key="error.system.monitor" scope="request"
  *                          type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException"
  *                          path=".systemError"
- * 							handler="org.lamsfoundation.lams.util.CustomStrutsExceptionHandler"
+ * 							handler="org.lamsfoundation.lams.web.util.CustomStrutsExceptionHandler"
  * @struts:action-forward name="scheduler" path="/TestScheduler.jsp"
  * @struts.action-forward name = "success" path = "/index.jsp"
  * 
Index: lams_monitoring/test/java/log4j.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/test/java/Attic/log4j.properties,v
diff -u -r1.1 -r1.2
--- lams_monitoring/test/java/log4j.properties	10 Feb 2005 03:31:02 -0000	1.1
+++ lams_monitoring/test/java/log4j.properties	6 Oct 2005 06:41:34 -0000	1.2
@@ -1,4 +1,4 @@
-log4j.rootLogger=INFO,stdout
+log4j.rootLogger=ERROR,stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %5p (%F:%L) - %m%n
\ No newline at end of file
Index: lams_monitoring/test/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/test/web/WEB-INF/Attic/web.xml,v
diff -u -r1.2 -r1.3
--- lams_monitoring/test/web/WEB-INF/web.xml	18 Apr 2005 07:50:15 -0000	1.2
+++ lams_monitoring/test/web/WEB-INF/web.xml	6 Oct 2005 06:42:01 -0000	1.3
@@ -61,7 +61,7 @@
 
 <filter>
 	<filter-name>HibernateFilter</filter-name>
-	<filter-class>org.springframework.orm.hibernate.support.OpenSessionInViewFilter</filter-class>
+	<filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
 	<init-param>
 		<param-name>sessionFactoryBeanName</param-name>
 		<param-value>coreSessionFactory</param-value>
Index: lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/test/web/WEB-INF/spring/Attic/applicationContext.xml,v
diff -u -r1.1 -r1.2
--- lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml	15 Apr 2005 04:33:35 -0000	1.1
+++ lams_monitoring/test/web/WEB-INF/spring/applicationContext.xml	6 Oct 2005 06:42:01 -0000	1.2
@@ -34,7 +34,7 @@
 
 
 	<!-- Hibernate SessionFactory -->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>
Index: lams_tool_forum/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/build.xml,v
diff -u -r1.21 -r1.22
--- lams_tool_forum/build.xml	7 Sep 2005 23:40:32 -0000	1.21
+++ lams_tool_forum/build.xml	6 Oct 2005 06:43:00 -0000	1.22
@@ -92,7 +92,7 @@
 				<fileset dir="${src.java.dir}">
 					<include name="**/*.java"/>
 				</fileset>
-			<hibernate version="2.0"/>
+			<hibernate version="3.0"/>
 		</hibernatedoclet>
 
     </target>
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/GenericEntity.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml	26 Jul 2005 14:40:48 -0000	1.2
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/GenericEntity.hbm.xml	6 Oct 2005 06:42:37 -0000	1.3
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN" 
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd">
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN" 
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping
 >
Index: lams_tool_forum/src/java/forumApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/Attic/forumApplicationContext.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/forumApplicationContext.xml	9 Sep 2005 06:00:15 -0000	1.7
+++ lams_tool_forum/src/java/forumApplicationContext.xml	6 Oct 2005 06:42:53 -0000	1.8
@@ -3,7 +3,7 @@
 <beans>
 
     <!-- Hibernate SessionFactory -->
-    <bean id="sessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+    <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityDao.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/GenericEntityDao.java,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityDao.java	17 Jun 2005 04:04:25 -0000	1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/GenericEntityDao.java	6 Oct 2005 06:42:53 -0000	1.2
@@ -1,12 +1,11 @@
 package org.lamsfoundation.lams.tool.forum.persistence;
 
-import org.springframework.orm.hibernate.HibernateCallback;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 
 import java.util.List;
-import java.util.Date;
 
 /**
  * @author conradb
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	9 Sep 2005 06:08:42 -0000	1.8
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	6 Oct 2005 06:45:30 -0000	1.9
@@ -13,7 +13,7 @@
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 	
 	<!-- Hibernate SessionFactory -->
-	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	4 Jul 2005 06:11:24 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaContentDAO.java	6 Oct 2005 06:45:30 -0000	1.3
@@ -1,20 +1,35 @@
-/*
- * Created on 15/03/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ***********************************************************************/
+
 package org.lamsfoundation.lams.tool.qa.dao.hibernate;
 
-import net.sf.hibernate.Hibernate;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
-
 import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.dao.IQaContentDAO;
-import org.springframework.orm.hibernate.HibernateCallback;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 /**
@@ -106,11 +121,16 @@
 	    	this.getHibernateTemplate().deleteAll(qaContent.getQaSessions());	
 	    }
 	    
-	    public void removeQa(Long qaId)
+	    public void removeQa(Long qaContentId)
 	    {
-	    	String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent"
-	            + " where qa.qaContentId = ?";
-	            this.getHibernateTemplate().delete(query,qaId,Hibernate.LONG);
+	    	if ( qaContentId != null ) {
+		    	String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent"
+		            + " where qa.qaContentId = ?";
+		    	Object obj = getSession().createQuery(query)
+					.setLong(0,qaContentId.longValue())
+					.uniqueResult();
+		    	getHibernateTemplate().delete(obj);
+	    	}
     	}
 	    
 	    public void deleteQa(QaContent qaContent)
@@ -120,9 +140,7 @@
 
 	    public void removeQaById(Long qaId)
 	    {
-	        String query = "from qa in class org.lamsfoundation.lams.tool.qa.QaContent"
-	        + " where qa.qaContentId = ?";
-	        this.getHibernateTemplate().delete(query,qaId,Hibernate.LONG);
+	    	removeQa(qaId);
 	    }
 
 	    
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/QaQueContentDAO.java,v
diff -u -r1.5 -r1.6
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java	27 Jul 2005 08:13:04 -0000	1.5
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java	6 Oct 2005 06:45:30 -0000	1.6
@@ -1,22 +1,38 @@
-/*
- * Created on 15/03/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ***********************************************************************/
+
 package org.lamsfoundation.lams.tool.qa.dao.hibernate;
 
 import java.util.List;
 
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
 import org.lamsfoundation.lams.tool.qa.dao.IQaQueContentDAO;
-import org.springframework.orm.hibernate.HibernateCallback;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	4 Jul 2005 06:11:24 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	6 Oct 2005 06:45:30 -0000	1.3
@@ -10,7 +10,7 @@
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.dao.IQaQueUsrDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	4 Jul 2005 06:11:24 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	6 Oct 2005 06:45:30 -0000	1.4
@@ -25,7 +25,7 @@
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.dao.IQaSessionDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/Attic/QaUploadedFileDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java	27 Jul 2005 08:13:04 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUploadedFileDAO.java	6 Oct 2005 06:45:30 -0000	1.3
@@ -1,20 +1,34 @@
-/*
- * Created on 15/03/2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+/***************************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ***********************************************************************/
+
 package org.lamsfoundation.lams.tool.qa.dao.hibernate;
 
 import java.util.List;
 
-import net.sf.hibernate.Hibernate;
-
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaUploadedFile;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUploadedFileDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 /**
@@ -83,9 +97,17 @@
 	    
 	    public void removeUploadFile(Long submissionId)
 	    {
-	    	String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile"
+	    	if (submissionId != null ) {
+	    		
+	    		String query = "from uploadedFile in class org.lamsfoundation.lams.tool.qa.QaUploadedFile"
 	            + " where uploadedFile.submissionId = ?";
-	            this.getHibernateTemplate().delete(query,submissionId,Hibernate.LONG);
+	    		Object obj = this.getSession().createQuery(query)
+					.setLong(0,submissionId.longValue())
+					.uniqueResult();
+	    		if ( obj != null ) { 
+	    			this.getHibernateTemplate().delete(obj);
+	    		}
+	    	}
     	}
 	    
 	    public List retrieveQaUploadedFiles(QaContent qa, boolean fileOnline)
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java	4 Jul 2005 06:11:24 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java	6 Oct 2005 06:45:30 -0000	1.3
@@ -20,12 +20,12 @@
  */
 package org.lamsfoundation.lams.tool.qa.dao.hibernate;
 
-import net.sf.hibernate.Hibernate;
+import org.hibernate.Hibernate;
 
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
 import org.lamsfoundation.lams.tool.qa.dao.IQaUsrRespDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 
 /**
@@ -78,9 +78,16 @@
     
     public void removeUserResponseByQaQueId(Long qaQueId)
     {
-    	String query = "from resp in class org.lamsfoundation.lams.tool.qa.QaUsrResp"
-            + " where resp.qaQueContentId = ?";
-            this.getHibernateTemplate().delete(query,qaQueId,Hibernate.LONG);
+    	if ( qaQueId != null ) {
+    		String query = "from resp in class org.lamsfoundation.lams.tool.qa.QaUsrResp"
+    			+ " where resp.qaQueContentId = ?";
+            Object obj = getSession().createQuery(query)
+				.setLong(0,qaQueId.longValue())
+				.uniqueResult();
+            if ( obj != null ) {
+            	getHibernateTemplate().delete(obj);
+            }
+    	}
 	}
 
 }
Index: lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/Attic/testqaApplicationContext.xml,v
diff -u -r1.3 -r1.4
--- lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml	4 Oct 2005 11:41:37 -0000	1.3
+++ lams_tool_laqa/test/java/org/lamsfoundation/lams/tool/qa/testqaApplicationContext.xml	6 Oct 2005 06:45:30 -0000	1.4
@@ -31,7 +31,7 @@
 	
 	
 	<!-- Hibernate SessionFactory -->
-	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>	
@@ -58,7 +58,7 @@
 	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
 	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
 	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory"><ref local="qaSessionFactory"/></property>
 	</bean>
 
Index: lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/test/web/WEB-INF/tiles/Attic/tiles-defs.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml	28 Jul 2005 03:48:38 -0000	1.2
+++ lams_tool_laqa/test/web/WEB-INF/tiles/tiles-defs.xml	6 Oct 2005 06:45:30 -0000	1.3
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE tiles-definitions PUBLIC
+   "-//Apache Software Foundation//DTD Tiles Configuration//EN"
+   "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
+ 
 <!--
 Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
 
Index: lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/qaApplicationContext.xml,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml	21 Jul 2005 06:59:26 -0000	1.4
+++ lams_tool_laqa/web/WEB-INF/qaApplicationContext.xml	6 Oct 2005 06:45:39 -0000	1.5
@@ -30,7 +30,7 @@
 	
 	
 	<!-- Hibernate SessionFactory -->
-	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="qaSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="dataSource"/></property>
 		<property name="mappingResources">
 			<list>	
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/Attic/NoticeboardAttachment.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml	23 Aug 2005 05:00:13 -0000	1.1
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml	6 Oct 2005 06:46:38 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
     
 <hibernate-mapping>
 <!-- 
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/Attic/NoticeboardContent.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	23 Aug 2005 05:00:13 -0000	1.1
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml	6 Oct 2005 06:46:38 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
     
 <hibernate-mapping>
 <!-- 
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/Attic/NoticeboardSession.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	23 Aug 2005 05:00:13 -0000	1.1
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml	6 Oct 2005 06:46:38 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
     
 <hibernate-mapping>
 <!-- 
Index: lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/Attic/NoticeboardUser.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	23 Aug 2005 05:00:13 -0000	1.1
+++ lams_tool_nb/conf/hibernate/mappings/org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml	6 Oct 2005 06:46:38 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
-    "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" >
     
 <hibernate-mapping>
 <!-- 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/Attic/applicationContext.xml,v
diff -u -r1.10 -r1.11
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml	15 Sep 2005 00:48:39 -0000	1.10
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/applicationContext.xml	6 Oct 2005 06:46:37 -0000	1.11
@@ -10,7 +10,7 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
 	<!-- Hibernate SessionFactory -->
-	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/Attic/NoticeboardAttachmentDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java	10 Aug 2005 06:50:39 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardAttachmentDAO.java	6 Oct 2005 06:46:37 -0000	1.5
@@ -9,7 +9,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardAttachmentDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 /**
  * @author mtruong
  *
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	10 Aug 2005 06:50:39 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	6 Oct 2005 06:46:37 -0000	1.5
@@ -24,13 +24,13 @@
 import java.util.List;
 import java.lang.Long;
 
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardContentDAO;
-import org.springframework.orm.hibernate.HibernateCallback;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
  * @author mtruong
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	10 Aug 2005 06:50:39 -0000	1.6
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	6 Oct 2005 06:46:37 -0000	1.7
@@ -22,16 +22,16 @@
 package org.lamsfoundation.lams.tool.noticeboard.dao.hibernate;
 
 import java.util.List;
-import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
+
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
-import org.springframework.orm.hibernate.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
-
 /**
  * @author mtruong
  * <p>Hibernate implementation for database access to Noticeboard sessions for the noticeboard tool.</p>
@@ -138,7 +138,7 @@
 	    user.setNbSession(session);
 	    session.getNbUsers().add(user);
 	    this.getHibernateTemplate().saveOrUpdate(user);
-	    this.getHibernateTemplate().saveOrUpdateCopy(session);	    
+	    this.getHibernateTemplate().merge(session);	    
 	}
 	
     /** @see org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardSessionDAO#getSessionsFromContent(org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession) */
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	26 Aug 2005 02:41:33 -0000	1.4
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	6 Oct 2005 06:46:37 -0000	1.5
@@ -28,7 +28,7 @@
 
 import org.lamsfoundation.lams.tool.noticeboard.dao.INoticeboardUserDAO;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
-import org.springframework.orm.hibernate.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 
 /**
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/Attic/testApplicationContext.xml,v
diff -u -r1.7 -r1.8
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml	11 Aug 2005 05:41:40 -0000	1.7
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml	6 Oct 2005 06:46:38 -0000	1.8
@@ -15,7 +15,7 @@
 	</bean>
 
 <!-- Hibernate SessionFactory -->
-	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="localDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
@@ -27,7 +27,7 @@
 		</property>
 		<property name="hibernateProperties">
 			<props>
-				<prop key="hibernate.dialect">net.sf.hibernate.dialect.MySQLDialect</prop>
+				<prop key="hibernate.dialect">org.hibernate.dialect.MySQLDialect</prop>
 				<prop key="hibernate.show_sql">false</prop>
 				<prop key="hibernate.c3p0.minPoolSize">5</prop>
 				<prop key="hibernate.c3p0.maxPoolSize">20</prop>
@@ -40,7 +40,7 @@
 	<!-- If we really use multiple SessionFactory, we have to change to JTA Transaction Manager -->
 	<!-- bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"/-->
 	<!-- Transaction manager for a single Hibernate SessionFactory (alternative to JTA) -->
-	<bean id="transactionManager" class="org.springframework.orm.hibernate.HibernateTransactionManager">
+	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
 	</bean>
 
Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.19 -r1.20
--- lams_tool_sbmt/build.xml	6 Oct 2005 04:29:53 -0000	1.19
+++ lams_tool_sbmt/build.xml	6 Oct 2005 06:48:49 -0000	1.20
@@ -137,7 +137,7 @@
 			            <include name="**/*/*.java"/>
 			        </fileset>
 			        <!-- hibernate 1 and hibernate 2 mapping files are not fully compatible-->
-			        <hibernate version="2.0"/>
+			        <hibernate version="3.0"/>
 			    </hibernatedoclet>
 				<!-- copy hbm.xml to src folder. This makes hbm.xml can be synchronized with classes folder in eclipse -->
 				<copy overwrite="yes" todir="${src.java.dir}">
Index: lams_tool_sbmt/conf/xdoclet/filters.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/filters.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/conf/xdoclet/filters.xml	27 Sep 2005 01:23:45 -0000	1.2
+++ lams_tool_sbmt/conf/xdoclet/filters.xml	6 Oct 2005 06:47:52 -0000	1.3
@@ -1,7 +1,7 @@
   <filter>
     <filter-name>hibernateFilter</filter-name>
     <filter-class>
-      org.springframework.orm.hibernate.support.OpenSessionInViewFilter
+      org.springframework.orm.hibernate3.support.OpenSessionInViewFilter
     </filter-class>
     <init-param>
       <param-name>sessionFactoryBeanName</param-name>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	9 Sep 2005 06:10:22 -0000	1.9
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	6 Oct 2005 06:47:52 -0000	1.10
@@ -7,7 +7,7 @@
 
 	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
   	<!-- Hibernate SessionFactory -->
-	<bean id="sbmtSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+	<bean id="sbmtSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
 		<property name="dataSource"><ref bean="toolDataSource"/></property>
 		<property name="mappingResources">
 			<list>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/Attic/LearnerDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java	8 Aug 2005 00:42:32 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/LearnerDAO.java	6 Oct 2005 06:47:52 -0000	1.3
@@ -23,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.sf.hibernate.FlushMode;
-import net.sf.hibernate.Hibernate;
-import net.sf.hibernate.type.Type;
+import org.hibernate.FlushMode;
+import org.hibernate.Hibernate;
+import org.hibernate.type.Type;
 
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.Learner;
@@ -41,14 +41,13 @@
 								" where user_id=? AND session_id=?";
 
 	public Learner getLearner(Long sessionID, Long userID) {
-		List list = this.getHibernateTemplate().
-		   find(FIND_BY_USER_ID_SESSION_ID, 
-				   new Object[]{userID, sessionID},
-				   new Type[]{Hibernate.LONG,Hibernate.LONG});
-		if(list != null && list.size() > 0)
-			return (Learner)list.get(0) ;
-		else
-			return null;
+		if ( sessionID != null && userID != null ) {
+			return (Learner) this.getSession().createQuery(FIND_BY_USER_ID_SESSION_ID)
+				.setLong(0, userID.longValue())
+				.setLong(1, sessionID.longValue())
+				.uniqueResult();
+		}
+		return null;
 	}
 
 	/* (non-Javadoc)
@@ -70,16 +69,16 @@
 	}
 
 	public List getSubmissionDetailsForUserBySession(Long userID, Long sessionID) {
-		List learnerList = this.getHibernateTemplate().find(FIND_FOR_USER_BY_SESSION, 
-													 new Object[]{userID, sessionID},
-													 new Type[]{Hibernate.LONG,Hibernate.LONG});
-		List list = null;
-		if(learnerList != null && learnerList.size() > 0){
-			Learner learner = (Learner) learnerList.get(0);
-			if(learner != null && learner.getSubmissionDetails() != null)
-				list = new ArrayList(learner.getSubmissionDetails());
+		if ( userID != null && sessionID != null ) {
+			Learner learner = (Learner) this.getSession().createQuery(FIND_FOR_USER_BY_SESSION)
+										.setLong(0, userID.longValue())
+										.setLong(1, sessionID.longValue())
+										.uniqueResult();
+			if(learner != null && learner.getSubmissionDetails() != null) {
+				return new ArrayList(learner.getSubmissionDetails());
+			}
 		}
-		return list;
+		return null;
 	}
 
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	10 Aug 2005 01:39:37 -0000	1.7
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmissionDetailsDAO.java	6 Oct 2005 06:47:52 -0000	1.8
@@ -8,17 +8,17 @@
 
 import java.util.List;
 
-import net.sf.hibernate.FlushMode;
-import net.sf.hibernate.Hibernate;
-import net.sf.hibernate.HibernateException;
-import net.sf.hibernate.Session;
-import net.sf.hibernate.type.Type;
+import org.hibernate.FlushMode;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.type.Type;
 
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmissionDetails;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO;
-import org.springframework.orm.hibernate.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateCallback;
 
 /**
  * @author Manpreet Minhas
@@ -83,9 +83,11 @@
 	 * @see org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO#getSubmissionDetailsBySession(java.lang.Long)
 	 */
 	public List getSubmissionDetailsBySession(Long sessionID) {
-		List list = this.getHibernateTemplate().find(FIND_BY_SESSION, 
-				 new Object[]{sessionID},
-				 new Type[]{Hibernate.LONG});
-		return list;
+		if ( sessionID != null ) {
+			return this.getSession().createQuery(FIND_BY_SESSION)
+				.setLong(0, sessionID.longValue())
+				.list();
+		}
+		return null;
 	}
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	4 Aug 2005 07:01:12 -0000	1.6
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesContentDAO.java	6 Oct 2005 06:47:52 -0000	1.7
@@ -1,22 +1,35 @@
-/*
- * Created on May 30, 2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
  */
 package org.lamsfoundation.lams.tool.sbmt.dao.hibernate;
 
 import java.util.List;
 
-import net.sf.hibernate.FlushMode;
-import net.sf.hibernate.Hibernate;
-import net.sf.hibernate.type.Type;
-
+import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.InstructionFiles;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
-import org.springframework.orm.hibernate.HibernateTemplate;
+import org.springframework.orm.hibernate3.HibernateTemplate;
 
 /**
  * @author Manpreet Minhas
@@ -44,14 +57,21 @@
 
 	public void deleteInstructionFile(Long contentID, Long uuid, Long versionID, String type) {
 		HibernateTemplate templ = this.getHibernateTemplate();
-		List list = templ.find(FIND_INSTRUCTION_FILE,new Object[]{contentID,uuid,versionID,type}
-				,new Type[]{Hibernate.LONG,Hibernate.LONG,Hibernate.LONG,Hibernate.STRING});
-		if(list != null && list.size() > 0){
-			InstructionFiles file = (InstructionFiles) list.get(0);
-			this.getSession().setFlushMode(FlushMode.AUTO);
-			templ.delete(file);
-			templ.flush();
+		if ( contentID != null && uuid != null && versionID != null ) {
+			List list = getSession().createQuery(FIND_INSTRUCTION_FILE)
+				.setLong(0,contentID.longValue())
+				.setLong(1,uuid.longValue())
+				.setLong(2,versionID.longValue())
+				.setString(3,type)
+				.list();
+			if(list != null && list.size() > 0){
+				InstructionFiles file = (InstructionFiles) list.get(0);
+				this.getSession().setFlushMode(FlushMode.AUTO);
+				templ.delete(file);
+				templ.flush();
+			}
 		}
 		
 	}
+		
 }
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	21 Jul 2005 07:31:47 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesReportDAO.java	6 Oct 2005 06:47:52 -0000	1.3
@@ -8,8 +8,7 @@
 
 import java.util.List;
 
-import net.sf.hibernate.FlushMode;
-
+import org.hibernate.FlushMode;
 import org.lamsfoundation.lams.learningdesign.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.sbmt.SubmitFilesReport;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesReportDAO;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.24 -r1.25
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	18 Aug 2005 00:23:43 -0000	1.24
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	6 Oct 2005 06:47:52 -0000	1.25
@@ -213,8 +213,10 @@
 			throw new ToolException(
 					"Failed to create the SubmitFiles tool seession");
 
-		SubmitFilesContent fromContent = submitFilesContentDAO
-				.getContentByID(fromContentId);
+		SubmitFilesContent fromContent = submitFilesContentDAO.getContentByID(fromContentId);
+		if ( fromContent == null ) {
+			// TODO need to get default content here!!!
+		}
 		SubmitFilesContent toContent = (SubmitFilesContent) fromContent.clone();
 		//reset some new attributes for toContent
 		toContent.setContentID(toContentId);
@@ -293,8 +295,7 @@
 	 * @see org.lamsfoundation.lams.tool.ToolContentManager#removeToolContent(java.lang.Long)
 	 */
 	public void removeToolContent(Long toolContentId, boolean removeSessionData)throws DataMissingException {
-		SubmitFilesContent submitFilesContent = submitFilesContentDAO
-				.getContentByID(toolContentId);
+		SubmitFilesContent submitFilesContent = submitFilesContentDAO.getContentByID(toolContentId);
 		if (submitFilesContent == null)
 			throw new DataMissingException(
 					"No such content with a contentID of : " + toolContentId
@@ -342,8 +343,11 @@
 		try {
 			content = submitFilesContentDAO.getContentByID(contentID);
 		} catch (Exception e) {
-			log.error("Could not find the content by givn ID:"+contentID+". Excpetion is " + e);
+			log.error("Could not find the content by given ID:"+contentID+". Excpetion is " + e);
 		}
+		if ( content == null )
+			log.error("Could not find the content by given ID:"+contentID);
+		
 		return content;
 	}
 
Index: lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/Attic/TestSubmitFilesService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java	9 Sep 2005 00:33:18 -0000	1.4
+++ lams_tool_sbmt/test/java/org/lamsfoundation/lams/tool/sbmt/service/TestSubmitFilesService.java	6 Oct 2005 06:47:52 -0000	1.5
@@ -30,7 +30,6 @@
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmissionDetailsDAO;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesContentDAO;
 import org.lamsfoundation.lams.tool.sbmt.dao.ISubmitFilesSessionDAO;
-import org.springframework.orm.hibernate.HibernateObjectRetrievalFailureException;
 
 /**
  * Note: this test sets up tool content ids and tool session ids that 
@@ -133,19 +132,11 @@
 		}
 
 		// Records should still exist
-		try{
-			SubmitFilesContent content = submitFilesContentDAO.getContentByID(toolContentId);
-			assertNotNull("Tool content data", content);
-		}catch(HibernateObjectRetrievalFailureException he){
-			fail("Tool content has been marked as deleted - should not have been deleted");
-		}
+		SubmitFilesContent content = submitFilesContentDAO.getContentByID(toolContentId);
+		assertNotNull("Tool content data", content);
 
-		try{
-			SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionContentId);
-			assertNotNull("Tool session data", session);
-		}catch(HibernateObjectRetrievalFailureException he){
-			fail("Tool session has been marked as deleted - should not have been deleted");
-		}
+		SubmitFilesSession session = submitFilesSessionDAO.getSessionByID(sessionContentId);
+		assertNotNull("Tool session data", session);
 
 		// This time remove the session data too! 
 		try {
@@ -158,19 +149,11 @@
 			fail("Tool exception thrown deleting the content toolContentId="+toolContentId);
 		}
 
-		try{
-			submitFilesContentDAO.getContentByID(toolContentId);
-			fail("Exception should be raised because content object has already been deleted");
-		}catch(HibernateObjectRetrievalFailureException he){
-			assertTrue("Tool Content has been deleted as expected", true);
-		}
+		SubmitFilesContent content2 = submitFilesContentDAO.getContentByID(toolContentId);
+		assertNull("Tool Content has been deleted as expected", content2);
 
-		try{
-			submitFilesSessionDAO.getSessionByID(sessionContentId);
-			fail("Exception should be raised because session object has already been deleted");
-		}catch(HibernateObjectRetrievalFailureException he){
-			assertTrue("Tool session has been deleted as expected", true);
-		}
+		SubmitFilesSession session2 = submitFilesSessionDAO.getSessionByID(sessionContentId);
+		assertNull("Tool session has been deleted as expected", session2);
 		
 	}
 
@@ -190,12 +173,8 @@
 			fail("Tool exception thrown deleting the content toolContentId="+toolContentId);
 		}
 
-		try{
-			submitFilesContentDAO.getContentByID(toolContentId);
-			fail("Exception should be raised because content object has already been deleted");
-		}catch(HibernateObjectRetrievalFailureException he){
-			assertTrue("Tool Content has been deleted as expected", true);
-		}
+		SubmitFilesContent content2 = submitFilesContentDAO.getContentByID(toolContentId);
+		assertNull("Tool Content has been deleted as expected", content2);
 
 	}