Index: lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Attic/Wiki.hbm.xml,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	27 Apr 2016 13:22:24 -0000	1.3.2.2
+++ lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml	21 Sep 2016 08:05:52 -0000	1.3.2.3
@@ -213,6 +213,14 @@
             />
 
         </set>
+        
+        <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
 
         <many-to-one
             name="mainPage"
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.19.2.3 -r1.19.2.4
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	1 Jul 2016 07:07:51 -0000	1.19.2.3
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	21 Sep 2016 08:06:28 -0000	1.19.2.4
@@ -131,6 +131,15 @@
 monitor.th.numlearners  =Number of Learners
 monitor.summary.td.addNotebook  =Add a notebook at end of Wiki
 monitor.summary.td.notebookInstructions  =Notebook instructions
+monitor.summary.date.restriction  =Deadline
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to use the Wiki after the set date and time.
+monitor.summary.after.date  =Date/time:
+monitor.summary.set.restriction  =Set restriction
+monitor.summary.unset.restriction  =Remove restriction
+authoring.info.teacher.set.restriction  =For this activity, the instructor fixed a deadline until {0}. After this time this activity will not be available.
+monitor.summary.notification  =Notification
+monitor.summary.date.restriction.set  =Deadline has been set
+monitor.summary.date.restriction.removed  =Deadline has been removed
 monitor.nosessions  =There are no sessions running yet for this Wiki.
 monitor.notebooks  =Notebook Reflections
 output.learner.number.of.edits  =Number of page edits
Index: lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/create_lams_tool_wiki.sql,v
diff -u -r1.11.2.1 -r1.11.2.2
--- lams_tool_wiki/db/sql/create_lams_tool_wiki.sql	11 May 2016 07:37:41 -0000	1.11.2.1
+++ lams_tool_wiki/db/sql/create_lams_tool_wiki.sql	21 Sep 2016 08:07:00 -0000	1.11.2.2
@@ -10,7 +10,7 @@
 create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid))ENGINE=InnoDB;
-create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid))ENGINE=InnoDB;
+create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint,submission_deadline datetime default null, primary key (uid))ENGINE=InnoDB;
 create table tl_lawiki10_wiki_page (
 	uid bigint not null auto_increment, 
 	wiki_uid bigint, 
Index: lams_tool_wiki/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/db/sql/table-schema.sql,v
diff -u -r1.5 -r1.5.12.1
--- lams_tool_wiki/db/sql/table-schema.sql	21 Oct 2008 03:20:19 -0000	1.5
+++ lams_tool_wiki/db/sql/table-schema.sql	21 Sep 2016 08:07:31 -0000	1.5.12.1
@@ -18,7 +18,7 @@
 create table tl_lawiki10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, wiki_uid bigint, primary key (uid));
 create table tl_lawiki10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), wiki_uid bigint, wiki_main_page_uid bigint, content_folder_id varchar(255), primary key (uid));
 create table tl_lawiki10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, wiki_session_uid bigint, entry_uid bigint, wiki_edits integer, primary key (uid));
-create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint, primary key (uid));
+create table tl_lawiki10_wiki (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, allow_learner_create_pages bit, allow_learner_insert_links bit, allow_learner_attach_images bit, notify_updates bit, reflect_on_activity bit, reflect_instructions text, minimum_edits integer, maximum_edits integer, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, wiki_main_page_uid bigint,submission_deadline datetime, primary key (uid));
 create table tl_lawiki10_wiki_page (uid bigint not null auto_increment, wiki_uid bigint, title varchar(255), editable bit, wiki_current_content bigint, added_by bigint, wiki_session_uid bigint, primary key (uid));
 create table tl_lawiki10_wiki_page_content (uid bigint not null auto_increment, wiki_page_uid bigint, body text, editor bigint, edit_date datetime, version bigint, primary key (uid));
 alter table tl_lawiki10_attachment add index FK9406D87760B3B03B (wiki_uid), add constraint FK9406D87760B3B03B foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20160919_updateFrom235.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/Attic/patch20160919_updateFrom235.sql,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java,v
diff -u -r1.3.2.2 -r1.3.2.3
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	11 May 2016 07:37:40 -0000	1.3.2.2
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiDTO.java	21 Sep 2016 08:11:29 -0000	1.3.2.3
@@ -25,6 +25,7 @@
 
 package org.lamsfoundation.lams.tool.wiki.dto;
 
+import java.util.Date;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeSet;
@@ -64,9 +65,13 @@
     private Integer minimumEdits;
 
     private Integer maximumEdits;
+   
+    public Date submissionDeadline;
 
-    public Set<WikiSessionDTO> sessionDTOs = new TreeSet<WikiSessionDTO>();
+    
 
+	public Set<WikiSessionDTO> sessionDTOs = new TreeSet<WikiSessionDTO>();
+
     public Long currentTab;
 
     /* Constructors */
@@ -85,8 +90,10 @@
 	notifyUpdates = wiki.isNotifyUpdates();
 	reflectOnActivity = wiki.isReflectOnActivity();
 	reflectInstructions = wiki.getReflectInstructions();
+    submissionDeadline = wiki.getSubmissionDeadline();
 	minimumEdits = wiki.getMinimumEdits();
 	maximumEdits = wiki.getMaximumEdits();
+	
 
 	for (Iterator<WikiSession> iter = wiki.getWikiSessions().iterator(); iter.hasNext();) {
 	    WikiSession session = iter.next();
@@ -228,4 +235,12 @@
     public void setCurrentTab(Long currentTab) {
 	this.currentTab = currentTab;
     }
+    
+    public Date getSubmissionDeadline() {
+    	return submissionDeadline;
+        }
+
+    public void setSubmissionDeadline(Date submissionDeadline) {
+    	this.submissionDeadline = submissionDeadline;
+        }
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java,v
diff -u -r1.4.2.3 -r1.4.2.4
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	11 May 2016 07:37:40 -0000	1.4.2.3
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/Wiki.java	21 Sep 2016 08:12:21 -0000	1.4.2.4
@@ -95,6 +95,8 @@
     private boolean defineLater;
 
     private Long toolContentId;
+    
+	private Date submissionDeadline;
 
     private Set<WikiSession> wikiSessions;
 
@@ -368,7 +370,21 @@
     public void setMainPage(WikiPage mainPage) {
 	this.mainPage = mainPage;
     }
+    
+    
+    /**
+    *
+    * @return
+    */
+    public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
+    
 
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+    
     /**
      * toString
      *
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java,v
diff -u -r1.9.2.2 -r1.9.2.3
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	11 May 2016 07:37:40 -0000	1.9.2.2
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	21 Sep 2016 08:13:57 -0000	1.9.2.3
@@ -74,4 +74,13 @@
 
     public static final String JAVASCRIPT_TOKEN = "javascript";
     public static final String JAVASCRIPT_REPLACE_TOKEN = "JAVASCRIPTREPLACE";
+    
+    public static final String MESSAGE_SEPARATOR = " ";
+    public static final String TEXT_SEARCH_DEFINITION_NAME = "text.search.output.definition.chat";
+    public static final String TEXT_SEARCH_DEFAULT_CONDITION_DISPLAY_NAME_KEY = "text.search.output.definition.chat.default.condition";
+    
+    /* Date time restriction */
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
+
 }
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java,v
diff -u -r1.11.2.4 -r1.11.2.5
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	5 Aug 2016 12:40:32 -0000	1.11.2.4
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	21 Sep 2016 08:15:15 -0000	1.11.2.5
@@ -26,11 +26,13 @@
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.TimeZone;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -41,6 +43,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
+
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.wiki.dto.WikiDTO;
@@ -59,6 +62,7 @@
 import org.lamsfoundation.lams.tool.wiki.web.forms.LearningForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -165,10 +169,12 @@
 	if (wikiService.getEventNotificationService().eventExists(WikiConstants.TOOL_SIGNATURE,
 		WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID)
 		&& wikiService.getEventNotificationService().isSubscribed(WikiConstants.TOOL_SIGNATURE,
-			WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID, wikiUser.getUserId().longValue())) {
-
+			WikiConstants.EVENT_NOTIFY_LEARNERS, toolSessionID, wikiUser.getUserId())) {
 	    wikiUserDTO.setNotificationEnabled(true);
 	}
+	
+	
+	
 
 	// add the userDTO to attributes
 	request.setAttribute(WikiConstants.ATTR_USER_DTO, wikiUserDTO);
@@ -222,7 +228,30 @@
 	    request.setAttribute(WikiConstants.ATTR_CONTENT_EDITAVLE, true);
 	}
 	request.setAttribute(WikiConstants.ATTR_FINISHED_ACTIVITY, wikiUser.isFinishedActivity());
+	
+	
+	/* Check if submission deadline is null */
+	
+	Date submissionDeadline = wikiDTO.getSubmissionDeadline();
+	request.setAttribute("wikiDTO", wikiDTO);
+	
 
+	if (submissionDeadline != null) {
+
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+	    request.setAttribute("submissionDeadline", submissionDeadline);
+
+	    // calculate whether submission deadline has passed, and if so forward to "submissionDeadline"
+	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
+		return mapping.findForward("submissionDeadline");
+	    }
+
+	}
+	
 	return mapping.findForward("wiki");
     }
 
Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java,v
diff -u -r1.10.2.4 -r1.10.2.5
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	11 May 2016 07:37:40 -0000	1.10.2.4
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	21 Sep 2016 08:15:50 -0000	1.10.2.5
@@ -29,6 +29,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -55,6 +56,9 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
+import java.util.Date;
+import org.lamsfoundation.lams.util.DateUtil;
+import java.util.TimeZone;
 
 /**
  * This action handles all the monitoring actions, which include opening
@@ -117,7 +121,21 @@
 
 	Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
 	wikiDT0.setCurrentTab(currentTab);
+	
+	/* Check if submission deadline is null */
 
+	Date submissionDeadline = wikiDT0.getSubmissionDeadline();
+
+	if (submissionDeadline != null) {
+
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    request.setAttribute("submissionDeadline", tzSubmissionDeadline.getTime());
+
+	}
+
 	request.setAttribute(WikiConstants.ATTR_WIKI_DTO, wikiDT0);
 	request.setAttribute(WikiConstants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 	request.setAttribute(WikiConstants.ATTR_IS_GROUPED_ACTIVITY, wikiService.isGroupedActivity(toolContentID));
@@ -156,7 +174,44 @@
 
 	return wikiUser;
     }
+    
+    
+    /**
+     * Set Submission Deadline
+     *
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
 
+	// set up wikiService
+	if (wikiService == null) {
+		wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext());
+	}
+
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Wiki wiki = wikiService.getWikiByContentId(contentID);
+
+	Long dateParameter = WebUtil.readLongParam(request,WikiConstants.ATTR_SUBMISSION_DEADLINE, true);
+	Date tzSubmissionDeadline = null;
+	if (dateParameter != null) {
+	    Date submissionDeadline = new Date(dateParameter);
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	}
+	wiki.setSubmissionDeadline(tzSubmissionDeadline);
+	System.out.println("datasetbefore"+wiki);
+	wikiService.saveOrUpdateWiki(wiki);
+	System.out.println("datasetafter"+wiki);
+	return null;
+    }
+
     /**
      * Shows a specific wiki based on the session id
      *