Index: lams_tool_nb/.classpath
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/.classpath	(.../.classpath)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/.classpath	(.../.classpath)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_4.0_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
@@ -13,7 +17,6 @@
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.6.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.9.5.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.9.5.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.3.6.Final.jar"/>
 	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/persistence/api/main/javax.persistence-api-2.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	(.../NoticeboardContentDAO.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardContentDAO.java	(.../NoticeboardContentDAO.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -38,7 +38,7 @@
  *         Hibernate implementation for database access to Noticeboard content for the noticeboard tool.
  *         </p>
  */
-@Repository("nbContentDAO")
+@Repository
 public class NoticeboardContentDAO extends LAMSBaseDAO implements INoticeboardContentDAO {
 
     private static final String FIND_NB_CONTENT = "from " + NoticeboardContent.class.getName()
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	(.../NoticeboardSessionDAO.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardSessionDAO.java	(.../NoticeboardSessionDAO.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -38,7 +38,7 @@
  *         Hibernate implementation for database access to Noticeboard sessions for the noticeboard tool.
  *         </p>
  */
-@Repository("nbSessionDAO")
+@Repository
 public class NoticeboardSessionDAO extends LAMSBaseDAO implements INoticeboardSessionDAO {
 
     private static final String FIND_NB_SESSION = "from " + NoticeboardSession.class.getName()
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	(.../NoticeboardUserDAO.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/NoticeboardUserDAO.java	(.../NoticeboardUserDAO.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -38,7 +38,7 @@
  *         Hibernate implementation for database access to Noticeboard users (learners) for the noticeboard tool.
  *         </p>
  */
-@Repository("nbUserDAO")
+@Repository
 public class NoticeboardUserDAO extends LAMSBaseDAO implements INoticeboardUserDAO {
     private static final String FIND_NB_USER_BY_SESSION = "from " + NoticeboardUser.class.getName()
 	    + " as nb where nb.userId=:userId and nb.nbSession.nbSessionId=:sessionId";
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardContent.java	(.../NoticeboardContent.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -31,15 +31,12 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Lob;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.GenericGenerator;
 import org.lamsfoundation.lams.contentrepository.exception.ItemNotFoundException;
 import org.lamsfoundation.lams.contentrepository.exception.RepositoryCheckedException;
 
@@ -58,20 +55,17 @@
 public class NoticeboardContent implements Serializable {
 
     @Id
-    @Column(name = "uid")
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
-    @GenericGenerator(name = "native", strategy = "native")
+    @Column
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long uid;
 
     @Column(name = "nb_content_id")
     private Long nbContentId;
 
-    @Lob
-    @Column(name = "title")
+    @Column
     private String title;
 
-    @Lob
-    @Column(name = "content")
+    @Column
     private String content;
 
     @Column(name = "define_later")
@@ -80,7 +74,6 @@
     @Column(name = "reflect_on_activity")
     private Boolean reflectOnActivity;
 
-    @Lob
     @Column(name = "reflect_instructions")
     private String reflectInstructions;
 
@@ -107,9 +100,8 @@
 
     @OneToMany(mappedBy = "nbContent",
 	    cascade = CascadeType.ALL,
-	    orphanRemoval = true,
-	    fetch = FetchType.LAZY)
-    private Set<NoticeboardSession> nbSessions = new HashSet<NoticeboardSession>();
+	    orphanRemoval = true)
+    private Set<NoticeboardSession> nbSessions;
     
     /** default constructor */
     public NoticeboardContent() {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardSession.java	(.../NoticeboardSession.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -40,8 +40,6 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.GenericGenerator;
-
 /**
  * <p>
  * The NoticeboardSession class represents a tool session for a noticeboard activity. Each tool session may represent a
@@ -74,15 +72,14 @@
     public static final String COMPLETED = "COMPLETED";
 
     @Id
-    @Column(name = "uid", nullable = false)
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
-    @GenericGenerator(name = "native", strategy = "native")
+    @Column
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long uid;
 
-    @Column(name = "nb_session_id", nullable = false)
+    @Column(name = "nb_session_id")
     private Long nbSessionId;
 
-    @Column(name = "nb_session_name", nullable = false)
+    @Column(name = "nb_session_name")
     private String nbSessionName;
 
     @Column(name = "session_start_date")
@@ -94,12 +91,12 @@
     @Column(name = "session_status")
     private String sessionStatus;
 
-    @ManyToOne()
-    @JoinColumn(name = "nb_content_uid", nullable = false)
+    @ManyToOne
+    @JoinColumn(name = "nb_content_uid")
     private NoticeboardContent nbContent;
 
     @OneToMany(mappedBy = "nbSession", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
-    private Set<NoticeboardUser> nbUsers = new HashSet<NoticeboardUser>();
+    private Set<NoticeboardUser> nbUsers;
 
     /** default constructor */
     public NoticeboardSession() {
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java	(.../NoticeboardUser.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/model/NoticeboardUser.java	(.../NoticeboardUser.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -34,8 +34,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.GenericGenerator;
-
 /**
  *
  * @author mtruong
@@ -60,23 +58,23 @@
 public class NoticeboardUser implements Serializable {
 
     @Id
-    @Column(name = "uid", nullable = false)
-    @GeneratedValue(strategy = GenerationType.AUTO, generator = "native")
-    @GenericGenerator(name = "native", strategy = "native")
+    @Column
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long uid;
 
-    @Column(name = "user_id", nullable = false)
+    @Column(name = "user_id")
     private Long userId;
 
-    @ManyToOne()
-    @JoinColumn(name = "nb_session_uid", nullable = false)
+    @ManyToOne
+    @JoinColumn(name = "nb_session_uid")
     private NoticeboardSession nbSession;
 
-    @Column(name = "username")
+    @Column
     private String username;
 
-    @Column(name = "fullname")
+    @Column
     private String fullname;
+    
     @Column(name = "user_status")
     private String userStatus;
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/nbApplicationContext.xml	(.../nbApplicationContext.xml)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -4,9 +4,7 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
-           				   http://www.springframework.org/schema/context 
-						   http://www.springframework.org/schema/context/spring-context-4.3.xsd"> 	<!--
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"> 	<!--
  	- Application context definition for lams noticeboard business layer.
 	-->
 
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java
===================================================================
diff -u -rb3b03858efeef1c37e36993757f56374a9f2b9f3 -r711e4127d79bb67af04a3b7a01155cc395171da5
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision b3b03858efeef1c37e36993757f56374a9f2b9f3)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java	(.../NoticeboardService.java)	(revision 711e4127d79bb67af04a3b7a01155cc395171da5)
@@ -62,7 +62,6 @@
 import org.lamsfoundation.lams.tool.service.ILamsToolService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.util.JsonUtil;
-import org.springframework.stereotype.Service;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
@@ -73,7 +72,6 @@
  *
  * @author mtruong
  */
-@Service(value="nbService")
 public class NoticeboardService
 	implements INoticeboardService, ToolContentManager, ToolSessionManager, ToolRestManager {
     private static Logger log = Logger.getLogger(NoticeboardService.class);