Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,v
diff -u -r1.29.2.3 -r1.29.2.4
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	19 Oct 2014 08:35:16 -0000	1.29.2.3
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	1 Dec 2014 22:06:08 -0000	1.29.2.4
@@ -17,53 +17,53 @@
 	</bean>
 
 	<!-- core beans -->
-	<bean id="forumDao" class="org.lamsfoundation.lams.tool.forum.persistence.ForumDao">
+	<bean id="forumDao" class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.ForumDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 	<bean id="forumUserDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.ForumUserDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.ForumUserDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="attachmentDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.AttachmentDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="messageDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.MessageDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.MessageDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="timestampDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.TimestampDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.TimestampDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 
 	<bean id="messageSeqDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.MessageSeqDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.MessageSeqDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 	<bean id="messageRatingDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.MessageRatingDAO">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.MessageRatingDAO">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
 	</bean>
 	<bean id="forumToolSessionDao"
-		class="org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao">
+		class="org.lamsfoundation.lams.tool.forum.persistence.hibernate.ForumToolSessionDao">
 		<property name="sessionFactory">
 			<ref bean="coreSessionFactory" />
 		</property>
Fisheye: Tag 1.5.14.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/AttachmentDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.13.12.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8.14.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8.14.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IAttachmentDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumToolSessionDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IMessageDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IMessageRatingDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IMessageSeqDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ITimestampDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.30.2.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3.2.3 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageRatingDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.7.2.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageSeqDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4.2.2 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/TimestampDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/AttachmentDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumToolSessionDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/MessageDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/MessageRatingDAO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/MessageSeqDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/TimestampDao.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.126.2.2 -r1.126.2.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	30 Oct 2014 18:24:51 -0000	1.126.2.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	1 Dec 2014 22:06:08 -0000	1.126.2.3
@@ -80,25 +80,25 @@
 import org.lamsfoundation.lams.tool.forum.dto.AverageRatingDTO;
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
-import org.lamsfoundation.lams.tool.forum.persistence.AttachmentDao;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumCondition;
-import org.lamsfoundation.lams.tool.forum.persistence.ForumDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
-import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
-import org.lamsfoundation.lams.tool.forum.persistence.ForumUserDao;
+import org.lamsfoundation.lams.tool.forum.persistence.IAttachmentDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IForumDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IForumToolSessionDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IForumUserDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IMessageDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IMessageRatingDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.IMessageSeqDAO;
+import org.lamsfoundation.lams.tool.forum.persistence.ITimestampDAO;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
-import org.lamsfoundation.lams.tool.forum.persistence.MessageDao;
 import org.lamsfoundation.lams.tool.forum.persistence.MessageRating;
-import org.lamsfoundation.lams.tool.forum.persistence.MessageRatingDAO;
 import org.lamsfoundation.lams.tool.forum.persistence.MessageSeq;
-import org.lamsfoundation.lams.tool.forum.persistence.MessageSeqDao;
 import org.lamsfoundation.lams.tool.forum.persistence.PersistenceException;
 import org.lamsfoundation.lams.tool.forum.persistence.Timestamp;
-import org.lamsfoundation.lams.tool.forum.persistence.TimestampDao;
 import org.lamsfoundation.lams.tool.forum.util.DateComparator;
 import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
 import org.lamsfoundation.lams.tool.forum.util.ForumToolContentHandler;
@@ -124,21 +124,21 @@
     private static final Logger log = Logger.getLogger(ForumService.class);
 
     // DAO variables
-    private ForumDao forumDao;
+    private IForumDAO forumDao;
 
-    private AttachmentDao attachmentDao;
+    private IAttachmentDAO attachmentDao;
 
-    private MessageDao messageDao;
+    private IMessageDAO messageDao;
 
-    private TimestampDao timestampDao;
+    private ITimestampDAO timestampDao;
 
-    private MessageSeqDao messageSeqDao;
+    private IMessageSeqDAO messageSeqDao;
     
-    private MessageRatingDAO messageRatingDao;
+    private IMessageRatingDAO messageRatingDao;
 
-    private ForumUserDao forumUserDao;
+    private IForumUserDAO forumUserDao;
 
-    private ForumToolSessionDao forumToolSessionDao;
+    private IForumToolSessionDAO forumToolSessionDao;
 
     // system level handler and service
     private ILamsToolService toolService;
@@ -1268,67 +1268,67 @@
 	this.toolService = toolService;
     }
 
-    public AttachmentDao getAttachmentDao() {
+    public IAttachmentDAO getAttachmentDao() {
 	return attachmentDao;
     }
 
-    public void setAttachmentDao(AttachmentDao attachmentDao) {
+    public void setAttachmentDao(IAttachmentDAO attachmentDao) {
 	this.attachmentDao = attachmentDao;
     }
 
-    public ForumDao getForumDao() {
+    public IForumDAO getForumDao() {
 	return forumDao;
     }
 
-    public void setForumDao(ForumDao forumDao) {
+    public void setForumDao(IForumDAO forumDao) {
 	this.forumDao = forumDao;
     }
 
-    public TimestampDao getTimestampDao() {
+    public ITimestampDAO getTimestampDao() {
 	return timestampDao;
     }
 
-    public void setTimestampDao(TimestampDao timestampDao) {
+    public void setTimestampDao(ITimestampDAO timestampDao) {
 	this.timestampDao = timestampDao;
     }
 
-    public MessageDao getMessageDao() {
+    public IMessageDAO getMessageDao() {
 	return messageDao;
     }
 
-    public void setMessageDao(MessageDao messageDao) {
+    public void setMessageDao(IMessageDAO messageDao) {
 	this.messageDao = messageDao;
     }
 
-    public MessageSeqDao getMessageSeqDao() {
+    public IMessageSeqDAO getMessageSeqDao() {
 	return messageSeqDao;
     }
 
-    public void setMessageSeqDao(MessageSeqDao messageSeqDao) {
+    public void setMessageSeqDao(IMessageSeqDAO messageSeqDao) {
 	this.messageSeqDao = messageSeqDao;
     }
     
-    public MessageRatingDAO getMessageRatingDao() {
+    public IMessageRatingDAO getMessageRatingDao() {
 	return messageRatingDao;
     }
 
-    public void setMessageRatingDao(MessageRatingDAO messageRatingDao) {
+    public void setMessageRatingDao(IMessageRatingDAO messageRatingDao) {
 	this.messageRatingDao = messageRatingDao;
     }
 
-    public ForumToolSessionDao getForumToolSessionDao() {
+    public IForumToolSessionDAO getForumToolSessionDao() {
 	return forumToolSessionDao;
     }
 
-    public void setForumToolSessionDao(ForumToolSessionDao forumToolSessionDao) {
+    public void setForumToolSessionDao(IForumToolSessionDAO forumToolSessionDao) {
 	this.forumToolSessionDao = forumToolSessionDao;
     }
 
-    public ForumUserDao getForumUserDao() {
+    public IForumUserDAO getForumUserDao() {
 	return forumUserDao;
     }
 
-    public void setForumUserDao(ForumUserDao forumUserDao) {
+    public void setForumUserDao(IForumUserDAO forumUserDao) {
 	this.forumUserDao = forumUserDao;
     }