Index: lams_tool_forum/build.properties
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/build.properties	(.../build.properties)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/build.properties	(.../build.properties)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -9,7 +9,7 @@
 ### project properties ###
 signature=lafrum11
 project.displayname = lams forum tool
-tool.version=20100303
+tool.version=20101025
 
 # hide tool option
 hideTool=false
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml
===================================================================
diff -u -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224 -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml	(.../Forum.hbm.xml)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -253,6 +253,22 @@
         />
 
         <property
+            name="notifyLearnersOnForumPosting"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="notify_learners_on_forum_posting"
+        />
+
+        <property
+            name="notifyTeachersOnForumPosting"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="notify_teachers_on_forum_posting"
+        />
+
+        <property
             name="notifyLearnersOnMarkRelease"
             type="boolean"
             update="true"
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	(.../create_lams_tool_forum.sql)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -45,6 +45,8 @@
    limited_input_flag smallint,
    reflect_instructions varchar(255),
    reflect_on_activity smallint, 
+   notify_learners_on_forum_posting tinyint DEFAULT 0,
+   notify_teachers_on_forum_posting tinyint DEFAULT 0,
    mark_release_notify tinyint DEFAULT 0,
    primary key (uid)
 )TYPE=InnoDB;
@@ -153,8 +155,8 @@
 alter table tl_lafrum11_timestamp add index MessageFK (message_uid), add constraint MessageFK foreign key (message_uid) references tl_lafrum11_message (uid);
 
 INSERT INTO tl_lafrum11_forum (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor,
- allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) 
-VALUES(1,"Forum","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,1,0,1,5000,0);
+ allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,notify_learners_on_forum_posting,notify_teachers_on_forum_posting,reflect_on_activity) 
+VALUES(1,"Forum","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,0,1,0,1,5000,0,0,0);
 
 INSERT INTO `tl_lafrum11_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `sequence_id`, `is_authored`, `is_anonymous`, `forum_session_uid`, `parent_uid`, `forum_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES 
   (1,NOW(),NOW(),NOW(),null,null,'Topic Heading','Topic message',1,1,0,NULL,NULL,1,0,0,NULL);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20101025_updateTo24.sql
===================================================================
diff -u
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20101025_updateTo24.sql	(revision 0)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20101025_updateTo24.sql	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -0,0 +1,14 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-2545 Deliver email messages to students/teachers on forum postings
+alter table tl_lafrum11_forum add column notify_learners_on_forum_posting tinyint;
+alter table tl_lafrum11_forum add column notify_teachers_on_forum_posting tinyint;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -133,6 +133,12 @@
 		<property name="gradebookService">
 			<ref bean="gradebookService" />
 		</property>
+		<property name="lessonService">
+			<ref bean="lessonService"/>
+		</property>
+		<property name="activityDAO">
+			<ref bean="activityDAO"/>
+		</property>		
 	</bean>
 
 	<bean id="forumService"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java
===================================================================
diff -u -rc081e2b0c9c82fc97d2d39fb7109c9c2f10ff224 -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision c081e2b0c9c82fc97d2d39fb7109c9c2f10ff224)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.java	(.../Forum.java)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -101,9 +101,13 @@
     private boolean reflectOnActivity;
 
     private String reflectInstructions;
-
+    
     private boolean notifyLearnersOnMarkRelease;
+    
+    private boolean notifyLearnersOnForumPosting;
 
+    private boolean notifyTeachersOnForumPosting;
+
     // conditions
     private Set<ForumCondition> conditions = new TreeSet<ForumCondition>(new TextSearchConditionComparator());
 
@@ -593,8 +597,32 @@
     public void setReflectOnActivity(boolean reflectOnActivity) {
 	this.reflectOnActivity = reflectOnActivity;
     }
+    
+    /**
+     * @hibernate.property column="notify_learners_on_forum_posting"
+     * @return
+     */
+    public boolean isNotifyLearnersOnForumPosting() {
+	return notifyLearnersOnForumPosting;
+    }
 
+    public void setNotifyLearnersOnForumPosting(boolean notifyLearnersOnForumPosting) {
+	this.notifyLearnersOnForumPosting = notifyLearnersOnForumPosting;
+    }
+    
     /**
+     * @hibernate.property column="notify_teachers_on_forum_posting"
+     * @return
+     */
+    public boolean isNotifyTeachersOnForumPosting() {
+	return notifyTeachersOnForumPosting;
+    }
+
+    public void setNotifyTeachersOnForumPosting(boolean notifyTeachersOnForumPosting) {
+	this.notifyTeachersOnForumPosting = notifyTeachersOnForumPosting;
+    }
+
+    /**
      * @hibernate.property column="mark_release_notify"
      * @return
      */
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	(.../ForumService.java)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -56,18 +56,23 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
+import org.lamsfoundation.lams.events.DeliveryMethodMail;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
+import org.lamsfoundation.lams.tool.ToolSession;
 import org.lamsfoundation.lams.tool.ToolSessionExportOutputData;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -158,6 +163,11 @@
     private IGradebookService gradebookService;
 
     private IEventNotificationService eventNotificationService;
+    
+    private ILessonService lessonService;
+    
+    private IActivityDAO activityDAO;
+    
     private Random generator = new Random();
 
     // ---------------------------------------------------------------------
@@ -1295,6 +1305,14 @@
 	this.gradebookService = gradebookService;
     }
 
+    public void setLessonService(ILessonService lessonService) {
+	this.lessonService = lessonService;
+    }
+    
+    public void setActivityDAO(IActivityDAO activityDAO) {
+	this.activityDAO = activityDAO;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -1353,7 +1371,44 @@
     public void saveTimestamp(Timestamp timestamp) {
 	timestampDao.saveOrUpdate(timestamp);
     }
+    
+    public void sendNotificationsOnNewPosting(Long forumId, Long sessionId, Message message) {
+	Forum forum = getForum(forumId);
+	ForumUser postAuthor = message.getCreatedBy();
+	String fullName = postAuthor.getLastName() + " " + postAuthor.getFirstName();
+	ToolSession toolSession = toolService.getToolSession(sessionId);
+	Long activityId = toolSession.getToolActivity().getActivityId();
+	ToolActivity activity = (ToolActivity) activityDAO.getActivityByActivityId(activityId, ToolActivity.class);
+	
+	if (forum.isNotifyLearnersOnForumPosting()) {
+	    List<User> learners = lessonService.getLearnersHaveAttemptedActivity(activity);
+	    if (learners != null && !learners.isEmpty()) {
+		ArrayList<Long> learnerIds = new ArrayList<Long>();
+		for (User learner : learners) {
+		    learnerIds.add(learner.getUserId().longValue());
+		}
+		
+		getEventNotificationService().sendMessage(learnerIds.toArray(new Long[0]), DeliveryMethodMail.getInstance(),
+			getLocalisedMessage("event.newposting.subject", new Object[] { forum.getTitle() }),
+			getLocalisedMessage("event.newposting.body", new Object[] { fullName, message.getBody() }));
+	    }
+	}
+	
+	if (forum.isNotifyTeachersOnForumPosting()) {
+	    List<User> monitoringUsers = lessonService.getMonitorsByToolSessionId(sessionId);
+	    if (monitoringUsers != null && !monitoringUsers.isEmpty()) {
+		ArrayList<Long> monitoringUsersIds = new ArrayList<Long>();
+		for (User monitoringUser : monitoringUsers) {
+		    monitoringUsersIds.add(monitoringUser.getUserId().longValue());
+		}
 
+		getEventNotificationService().sendMessage(monitoringUsersIds.toArray(new Long[0]), DeliveryMethodMail.getInstance(),
+			getLocalisedMessage("event.newposting.subject", new Object[] { forum.getTitle() }),
+			getLocalisedMessage("event.newposting.body", new Object[] { fullName, message.getBody() }));
+	    }
+	}
+    }
+
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getForumOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	(.../IForumService.java)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -431,4 +431,6 @@
     public String createTextSearchConditionName(Collection<ForumCondition> existingConditions);
 
     public void deleteCondition(ForumCondition condition) throws PersistenceException;
+    
+    void sendNotificationsOnNewPosting(Long forumId, Long sessionId, Message message);
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
diff -u -r2dbea686e81e6a5843328d8c0bd814b63e64d36f -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 2dbea686e81e6a5843328d8c0bd814b63e64d36f)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -586,7 +586,10 @@
 
 	    messageDTO.setLastTopicDate(forumService.getLastTopicDate(messageDTO.getMessage().getUid()));
 	}
-
+	
+	// notify learners and teachers
+	forumService.sendNotificationsOnNewPosting(forumId, sessionId, message);
+	
 	return mapping.findForward("success");
     }
 
@@ -693,6 +696,10 @@
 
 	// Saving or updating user timestamp
 	saveUserTimestamp(rootTopicId, forumUser);
+	
+	// notify learners and teachers
+	Long forumId = (Long) sessionMap.get(ForumConstants.FORUM_ID);
+	forumService.sendNotificationsOnNewPosting(forumId, sessionId, message);
 
 	return mapping.findForward("success");
     }
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r1ef4b877aea0883709c641351e07595c6be84361
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 1ef4b877aea0883709c641351e07595c6be84361)
@@ -50,6 +50,22 @@
 	<html:text property="forum.limitedChar" styleId="limitedChar" />
 </p>
 
+<p style="margin-bottom: 15px;"><fmt:message key="label.authoring.advanced.send.emails.to" /> </p>
+<p style="margin-left: 60px; ">
+	<html:checkbox property="forum.notifyLearnersOnForumPosting" styleId="notifyLearnersOnForumPosting" styleClass="noBorder">
+	</html:checkbox>
+	<label for="notifyLearnersOnForumPosting">
+		<fmt:message key="label.authoring.advanced.learners" />
+	</label>
+</p>
+<p style="margin-left: 60px;">
+	<html:checkbox property="forum.notifyTeachersOnForumPosting" styleId="notifyTeachersOnForumPosting" styleClass="noBorder">
+	</html:checkbox>
+	<label for="notifyTeachersOnForumPosting">
+		<fmt:message key="label.authoring.advanced.teachers" />
+	</label>
+</p>
+
 <p>
 	<html:checkbox property="forum.notifyLearnersOnMarkRelease" styleId="notifyLearnersOnMarkRelease"
 		styleClass="noBorder">