Index: lams_tool_forum/.classpath
===================================================================
diff -u -r62402371ee899b9b20c61c988149efbec1cc00bd -rf2dc26e95cad64b7d5c55b483a0fbb32691d7f13
--- lams_tool_forum/.classpath	(.../.classpath)	(revision 62402371ee899b9b20c61c988149efbec1cc00bd)
+++ lams_tool_forum/.classpath	(.../.classpath)	(revision f2dc26e95cad64b7d5c55b483a0fbb32691d7f13)
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="lib" path="/lams_build/lib/lams/lams.jar"/>
+	<classpathentry sourcepath="/lams_common" kind="lib" path="/lams_build/lib/lams/lams.jar"/>
 	<classpathentry sourcepath="/lams_contentrepository" kind="lib" path="/lams_build/lib/lams/lams-contentrepository.jar"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE13_CONTAINER"/>
 	<classpathentry sourcepath="/lams_learning" kind="lib" path="/lams_build/lib/lams/lams-learning.jar"/>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
===================================================================
diff -u -re3a49cfedf88904e13c5286d6d70f169f5930a50 -rf2dc26e95cad64b7d5c55b483a0fbb32691d7f13
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision e3a49cfedf88904e13c5286d6d70f169f5930a50)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java	(.../MessageDao.java)	(revision f2dc26e95cad64b7d5c55b483a0fbb32691d7f13)
@@ -14,8 +14,8 @@
  * @author conradb
  */
 public class MessageDao extends HibernateDaoSupport {
-	private static final String SQL_QUERY_FIND_ROOT_TOPICS = "from " + Message.class.getName() 
-					+ " where parent_uid is null and forum_session_uid=?";
+	private static final String SQL_QUERY_FIND_ROOT_TOPICS = "from " + Message.class.getName() +" m "
+					+ " where parent_uid is null and m.toolSession.sessionId=?";
 	
 	private static final String SQL_QUERY_FIND_TOPICS_FROM_AUTHOR = "from " + Message.class.getName()
 					+ " where is_authored = true and forum_uid=?";
@@ -24,7 +24,7 @@
 					+ " where parent=?";
 	
 	private static final String SQL_QUERY_BY_USER_SESSION = "from " + Message.class.getName() + " m "
-					+ " where m.createdBy.uid = ? and  m.toolSession.uid=?";
+					+ " where m.createdBy.uid = ? and  m.toolSession.sessionId=?";
 	
 	private static final String SQL_QUERY_BY_SESSION = "from " + Message.class.getName() + " m "
 					+ " where m.toolSession.sessionId=?";
@@ -70,8 +70,8 @@
 	public List getRootTopics(Long sessionId) {
 		return this.getHibernateTemplate().find(SQL_QUERY_FIND_ROOT_TOPICS, sessionId);
 	}
-	public List getTopicsFromAuthor(Long forumId) {
-		return this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPICS_FROM_AUTHOR, forumId);
+	public List getTopicsFromAuthor(Long forumUid) {
+		return this.getHibernateTemplate().find(SQL_QUERY_FIND_TOPICS_FROM_AUTHOR, forumUid);
 	}
 
 	public void deleteById(Long uid) {