Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql,v
diff -u -r1.10 -r1.11
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	15 Apr 2008 01:58:29 -0000	1.10
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	15 Apr 2008 02:49:39 -0000	1.11
@@ -41,8 +41,6 @@
    allow_upload smallint, 
    maximum_reply integer, 
    minimum_reply integer,
-   limited_of_chars integer,
-   limited_input_flag smallint,
    reflect_instructions varchar(255),
    reflect_on_activity smallint, 
    primary key (uid)
@@ -120,8 +118,8 @@
 
 
 INSERT INTO tl_lawiki10_wiki (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_rich_editor,
- allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) 
-VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,1,5000,0);
+ allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_upload,maximum_reply, minimum_reply,reflect_on_activity) 
+VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,0);
 
 INSERT INTO `tl_lawiki10_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `is_authored`, `is_anonymous`, `wiki_session_uid`, `parent_uid`, `wiki_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES 
   (1,NOW(),NOW(),NOW(),null,null,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	15 Apr 2008 01:58:29 -0000	1.6
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	15 Apr 2008 02:49:40 -0000	1.7
@@ -75,8 +75,6 @@
 	
 	private Set messages;
 	private Set attachments;
-	private int limitedChar;
-    private boolean limitedInput;
     
 	private boolean reflectOnActivity;
 	private String reflectInstructions;
@@ -444,26 +442,6 @@
 		toContent.setContentId(contentId);
 		return toContent;
 	}
-	/**
-	 * @hibernate.property column="limited_of_chars"
-	 * @return
-	 */
-	public int getLimitedChar() {
-		return limitedChar;
-	}
-	public void setLimitedChar(int limitedChar) {
-		this.limitedChar = limitedChar;
-	}
-	/**
-	 * @hibernate.property column="limited_input_flag"
-	 * @return
-	 */
-	public boolean isLimitedInput() {
-		return limitedInput;
-	}
-	public void setLimitedInput(boolean limitedInput) {
-		this.limitedInput = limitedInput;
-	}
 	public WikiToolContentHandler getToolContentHandler() {
 		return toolContentHandler;
 	}
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	15 Apr 2008 01:58:29 -0000	1.6
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	15 Apr 2008 02:49:40 -0000	1.7
@@ -920,7 +920,6 @@
 	    	toolContentObj.setCreated(now);
 	    	toolContentObj.setDefineLater(Boolean.FALSE);		    	
 	    	toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
-	    	toolContentObj.setLimitedChar(5000); // this is the default value
    	    	toolContentObj.setReflectOnActivity(Boolean.FALSE);
 	    	toolContentObj.setReflectInstructions(null);
 
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	15 Apr 2008 01:58:29 -0000	1.6
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	15 Apr 2008 02:49:39 -0000	1.7
@@ -64,7 +64,6 @@
 	public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
 	public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks";
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
-	public static final String ATTR_LIMITED_CHARS = "limitedChars";
 
 	public static final String ONLINE_ATTACHMENT = "online_att";
 	public static final String OFFLINE_ATTACHMENT = "offline_att";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	9 Apr 2008 07:06:03 -0000	1.3
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java	15 Apr 2008 02:49:40 -0000	1.4
@@ -932,12 +932,6 @@
 			if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){
 				return errors;
 			}
-			/*if(!form.getWiki().isAllowRichEditor() && form.getWiki().isLimitedInput()){
-				if(form.getWiki().getLimitedChar() <=0){
-					ActionMessage error = new ActionMessage("error.limit.char.less.zero");
-					errors.add(ActionMessages.GLOBAL_MESSAGE, error);
-				}
-			}*/
 			if(!form.getWiki().isAllowNewWikiPage()){
 				if(form.getWiki().getMaximumReply() !=0 
 						&& (form.getWiki().getMaximumReply() < form.getWiki().getMinimumReply())){
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	15 Apr 2008 01:58:29 -0000	1.6
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	15 Apr 2008 02:49:40 -0000	1.7
@@ -206,15 +206,8 @@
 			wikiService.updateWiki(wiki);
 		}
 		
-		//set some option flag to HttpSession
-		// if allowRichEditor = true then don't restrict the number of chars
-		// if isLimitedInput = false then don't restrict the number of chars
-		// Indicate don't restrict number of chars by allowNumber = 0
 		Long wikiId = wiki.getUid();
-		//Boolean allowRichEditor = new Boolean(wiki.isAllowRichEditor());
 		Boolean allowRichEditor = new Boolean(true);
-		//int allowNumber = wiki.isLimitedInput() || wiki.isAllowRichEditor() ? wiki.getLimitedChar() : 0;
-		int allowNumber = wiki.getLimitedChar();
 		
 		// get notebook entry
 		String entryText = new String();
@@ -234,7 +227,6 @@
 		sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
-		sessionMap.put(WikiConstants.ATTR_LIMITED_CHARS,new Integer(allowNumber));
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_INSTRUCTION,wiki.getReflectInstructions());
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ENTRY, entryText);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java,v
diff -u -r1.6 -r1.7
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	15 Apr 2008 01:58:29 -0000	1.6
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	15 Apr 2008 02:49:39 -0000	1.7
@@ -112,8 +112,6 @@
   
     public void reset(ActionMapping mapping, HttpServletRequest request){
     	wiki.setAllowAnonym(false);
-    	//wiki.setAllowRichEditor(false);
-    	wiki.setLimitedInput(false);
     	wiki.setLockWhenFinished(false);
     	wiki.setAllowNewWikiPage(false);
     	wiki.setAllowAttachImage(false);
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/authoring/advance.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	15 Apr 2008 01:58:29 -0000	1.10
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	15 Apr 2008 02:49:39 -0000	1.11
@@ -50,16 +50,6 @@
 </p>
 
 <p>
-	<html:checkbox property="wiki.limitedInput" styleId="limitedInput"	styleClass="noBorder">
-	</html:checkbox>
-	<label for="limitedInput">
-		<fmt:message key="label.authoring.advance.limited.input" />
-	</label>
-
-	<html:text property="wiki.limitedChar" styleId="limitedChar" />
-</p>
-
-<p>
 	<html:checkbox property="wiki.reflectOnActivity" styleClass="noBorder"	styleId="reflectOn">
 	</html:checkbox>
 	<label for="reflectOn">
@@ -138,37 +128,6 @@
 </p>
 
 <script type="text/javascript">
-			var limit = document.getElementById("limitedInput");
-			var limitChar = document.getElementById("limitedChar");
-
-			limit.onclick= initAdvanced;
-			function initAdvanced(){
-				if(limit.checked){
-					limitChar.disabled=false;
-				}else{
-					limitChar.disabled=true;
-				}
-				
-			}
-			initAdvanced();
-			limitChar.onblur=function(){
-				var min = 0;
-				var errors = '';
-				var num = parseFloat(this.value);
-				if(isNaN(num)) 
-					errors = '<fmt:message key="js.error.invalid.number"/>\n';
-				else if (num <= min)
-					errors = '<fmt:message key="js.error.min.number"/>';
-				if(errors)
-					alert('<fmt:message key="js.error.title"/>\n'+errors);
-				
-			}
-			
-			var min = document.getElementById("minimumReply");
-			var max = document.getElementById("maximumReply");
-			min.disabled=false;
-			max.disabled=false;
-			
 			function checkReflection(){
 				var ropt = document.getElementById("reflectOn");
 				var rins = document.getElementById("reflectInstructions");