Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java
===================================================================
diff -u -rd62b6dd9025c676bb6c066f82941148f0dd91014 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision d62b6dd9025c676bb6c066f82941148f0dd91014)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/NbDataAccessTestCase.java	(.../NbDataAccessTestCase.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -139,7 +139,11 @@
 	 /** Define the context files. Overrides method in AbstractLamsTestCase */
     protected String[] getContextConfigLocation() {
     	return new String[] {
-    	       "org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"};
+    	        //"org/lamsfoundation/lams/applicationContext.xml",
+    			//"org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+    			//"org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+    			//"org/lamsfoundation/lams/learning/learningApplicationContext.xml",
+    			"org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml"};
     }
     
     /** Define the sessionFactory bean name located in testApplication.xml. */
@@ -293,8 +297,7 @@
     		assertEquals(content.getOfflineInstructions(), DEFAULT_OFFLINE_INSTRUCTIONS);
     		assertEquals(content.isDefineLater(), DEFAULT_DEFINE_LATER);
     		assertEquals(content.isForceOffline(), DEFAULT_FORCE_OFFLINE);
-    		assertEquals(content.getCreatorUserId(), DEFAULT_CREATOR_USER_ID);
-     } 
+    		     } 
     
     protected void assertEqualsForSessionContent(NoticeboardSession ns)
     {
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardAttachmentDAO.java
===================================================================
diff -u -r1ab9c5b7a63fb4b7a3b7ab66414873c9de17a7f7 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardAttachmentDAO.java	(.../TestNoticeboardAttachmentDAO.java)	(revision 1ab9c5b7a63fb4b7a3b7ab66414873c9de17a7f7)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardAttachmentDAO.java	(.../TestNoticeboardAttachmentDAO.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -53,6 +53,8 @@
 	     super.cleanNbContentData(TEST_NB_ID);
 	 }
 	 
+	 
+	
 	 public void testRetrieveAttachment()
 	 {
 	     //test retrieveAttachmentByUuid
@@ -96,7 +98,21 @@
 	     assertNull(nbAttachment);
 	     
 	 } 
+	 
+	 public void testRemoveAttachmentByUuid()
+	 {
+	     nbAttachment = attachmentDao.retrieveAttachmentByUuid(TEST_UUID);
+	     assertNotNull(nbAttachment);
+	     
+	     attachmentDao.removeAttachment(TEST_UUID);
+	     
+	     nbAttachment = attachmentDao.retrieveAttachmentByUuid(TEST_UUID);
+	     assertNull(nbAttachment);
+	     
+	 }
+	 
 	
+	
 	 
 	 
 }
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardContentDAO.java
===================================================================
diff -u -r92b349a2431f5a98cc1f505d3708f5b539df4e5c -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardContentDAO.java	(.../TestNoticeboardContentDAO.java)	(revision 92b349a2431f5a98cc1f505d3708f5b539df4e5c)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/dao/hibernate/TestNoticeboardContentDAO.java	(.../TestNoticeboardContentDAO.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -69,18 +69,7 @@
         	super.cleanNbContentData(TEST_NB_ID);
         }
     }
-    
    
-    public void testgetNbContentByUID()
-    {
-       nbContent = noticeboardDAO.getNbContentByUID(new Long(1));
-       
-       assertEquals(nbContent.getUid(), new Long(1));
-       assertEquals(nbContent.getNbContentId(), DEFAULT_CONTENT_ID);
-       assertContentEqualsDefaultData(nbContent);
-	  
-    } 
-
    public void testfindNbContentByID()
     {
         nbContent = noticeboardDAO.findNbContentById(TEST_NB_ID);
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java
===================================================================
diff -u -r2a0789e8f692b6f387d78f980e7889674d41d8b2 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java	(.../TestNoticeboardServicePOJO.java)	(revision 2a0789e8f692b6f387d78f980e7889674d41d8b2)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestNoticeboardServicePOJO.java	(.../TestNoticeboardServicePOJO.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -33,6 +33,7 @@
 import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
 import org.lamsfoundation.lams.tool.noticeboard.NbDataAccessTestCase;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent;
+import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardSession;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardUser;
 import org.lamsfoundation.lams.tool.noticeboard.NoticeboardAttachment;
@@ -521,6 +522,24 @@
 	    assertNull(attachment);
 	    
 	}
+	
+	public void testRemoveAttachmentByUuid()
+	{
+	    initNbAttachmentData();
+	    	    
+	    nbService.removeAttachmentByUuid(TEST_UUID);
+	   
+	    attachment = nbService.retrieveAttachmentByUuid(TEST_UUID);
+	    
+	    assertNull(attachment);
+	    
+	}
+	
+	public void testGetToolDefaultContentIdBySignature()
+	{
+	    Long defaultToolContentId = nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE);
+	    assertNotNull(defaultToolContentId);
+	}
 }
 	
 	
\ No newline at end of file
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java
===================================================================
diff -u -r14e4648edfb90ace995634a421388ed3e82a2931 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java	(.../TestToolContentManager.java)	(revision 14e4648edfb90ace995634a421388ed3e82a2931)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolContentManager.java	(.../TestToolContentManager.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -37,6 +37,7 @@
 /**
  * @author mtruong
  *
+ *TODO: the default content id is now not hard coded and taken from the database, ensure the test cases stillw ork
  */
 public class TestToolContentManager extends NbDataAccessTestCase {
 	
@@ -53,7 +54,7 @@
 	{
 		super(name);
 	}
-
+	
 	protected void setUp() throws Exception
 	{
 		super.setUp();
@@ -168,7 +169,7 @@
 	   // cleanCopyContent = true;
 	    
 	    //remove the default content so it will trigger the exception
-	    nbService.removeNoticeboard(NoticeboardConstants.DEFAULT_CONTENT_ID);
+	    nbService.removeNoticeboard(nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
 	    
 	    try
 	    {
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java
===================================================================
diff -u -r14e4648edfb90ace995634a421388ed3e82a2931 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java	(.../TestToolSessionManager.java)	(revision 14e4648edfb90ace995634a421388ed3e82a2931)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/service/TestToolSessionManager.java	(.../TestToolSessionManager.java)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -23,8 +23,6 @@
 /*
  * Created on Jul 8, 2005
  *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.lamsfoundation.lams.tool.noticeboard.service;
 import org.lamsfoundation.lams.tool.noticeboard.NbDataAccessTestCase;
@@ -39,6 +37,7 @@
 /**
  * @author mtruong
  *
+ * *TODO: the default content id is now not hard coded and taken from the database, ensure the test cases stillw ork
  */
 public class TestToolSessionManager extends NbDataAccessTestCase {
     
@@ -51,8 +50,8 @@
 	{
 		super(name);
 	}
-
-	protected void setUp() throws Exception
+    
+   protected void setUp() throws Exception
 	{
 		super.setUp();
 		//setup some data
@@ -145,7 +144,7 @@
 	        nbSession = nbService.retrieveNoticeboardSession(NEW_SESSION_ID);
 		    
 		    assertEquals("validating session id:", nbSession.getNbSessionId(), NEW_SESSION_ID);
-		    assertEquals("Validating content Id:", nbSession.getNbContent().getNbContentId(), DEFAULT_CONTENT_ID);
+		    assertEquals("Validating content Id:", nbSession.getNbContent().getNbContentId(), nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
 		    assertContentEqualsDefaultData(nbSession.getNbContent());
 	    }
 	    catch (ToolException e)
@@ -160,7 +159,7 @@
 	
 	public void testCreateToolSessionDefaultContentMissing() throws ToolException
 	{
-	    nbService.removeNoticeboard(DEFAULT_CONTENT_ID);
+	    nbService.removeNoticeboard(nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE));
 	    
 	    try
 	    {
Index: lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml
===================================================================
diff -u -re5ebe5f2cd90573062a307f170341ef7d8c52443 -r09f53aadc7e65fbbda0d3dc592c50621ac578a81
--- lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml	(.../testApplicationContext.xml)	(revision e5ebe5f2cd90573062a307f170341ef7d8c52443)
+++ lams_tool_nb/test/java/org/lamsfoundation/lams/tool/noticeboard/testApplicationContext.xml	(.../testApplicationContext.xml)	(revision 09f53aadc7e65fbbda0d3dc592c50621ac578a81)
@@ -14,14 +14,14 @@
 		<property name="password"><value>lamsdemo</value></property>
 	</bean>
 
-	<!-- Hibernate SessionFactory -->
-	<bean id="nbSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
+<!-- Hibernate SessionFactory -->
+	  <bean id="nbSessionFactory" class="org.springframework.orm.hibernate.LocalSessionFactoryBean">
 		<property name="dataSource"><ref local="localDataSource"/></property>
 		<property name="mappingResources">
 			<list>	
 				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardContent.hbm.xml</value>
-				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml</value> 
-				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml</value> 
+				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardSession.hbm.xml</value>
+				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardUser.hbm.xml</value>
 				<value>org/lamsfoundation/lams/tool/noticeboard/NoticeboardAttachment.hbm.xml</value> 
 			</list>
 		</property>
@@ -54,51 +54,41 @@
 				<property name="nbSessionDAO"><ref bean="nbSessionDAO"/></property>
 				<property name="nbUserDAO"><ref bean="nbUserDAO"/></property>
 				<property name="nbAttachmentDAO"><ref bean="nbAttachmentDAO"/></property>
-			</bean>
+			<!-- 	<property name="toolService"><ref bean="lamsToolService"/></property>
+				<property name="learnerService"><ref bean="learnerService"/></property> -->
+				</bean>
 		</property>
 		<property name="transactionAttributes">
 			<props>
 				<prop key="create*">PROPAGATION_REQUIRED</prop>
 				<prop key="copy*">PROPAGATION_REQUIRED</prop>
 				<prop key="update*">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
 				<prop key="retrieve*">PROPAGATION_REQUIRED</prop>
 				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean> 
 
-	<!--
-	  - Lams survey primary business object (default implementation), as an inner bean wrapped
-		- by an outer transactional proxy. The two bean definitions could have been separate,
-		- but this is cleaner as there is no need to ever access the unwrapped object.
-		-->
 
-	<!--  <bean id="nbService" parent="baseTransactionProxy">
-		<property name="target">
-			<bean class="org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServicePOJO">
-				<property name="nbContentDAO"><ref bean="nbContentDAO"/></property>
-				<property name="nbSessionDAO"><ref bean="nbSessionDAO"/></property>
-			</bean>
-		</property>
-	</bean>  -->
-	
+
 	<!--  DAO classes -->
 	<bean id="nbContentDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardContentDAO">
 		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
 	</bean>  
-	
+
 	<bean id="nbSessionDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardSessionDAO">
 		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
-	</bean> 
-
+	</bean>
+	
 	<bean id="nbUserDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardUserDAO">
 		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
 	</bean>
 	
 	<bean id="nbAttachmentDAO" class="org.lamsfoundation.lams.tool.noticeboard.dao.hibernate.NoticeboardAttachmentDAO">
 		<property name="sessionFactory"><ref local="nbSessionFactory"/></property>
 	</bean>
-
+	
 </beans>