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.9 -r1.10
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	15 May 2008 04:31:55 -0000	1.9
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	12 Jun 2008 03:03:07 -0000	1.10
@@ -64,6 +64,7 @@
 	public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
 	public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks";
 	public static final String ATTR_ALLOW_REVERT_PAGES = "allowRevertPages";
+	public static final String ATTR_MAXIMUM_REPLIES = "maximumReplies";
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
 
 	public static final String ONLINE_ATTACHMENT = "online_att";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java,v
diff -u -r1.2 -r1.3
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java	21 May 2008 05:01:09 -0000	1.2
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java	12 Jun 2008 03:03:07 -0000	1.3
@@ -82,10 +82,6 @@
 public class WikiLinkHandlerServlet extends HttpServlet {
 
 	private static Logger log = Logger.getLogger(WikiLinkHandlerServlet.class);
-
-	private static final String JNDI_DATASOURCE = "java:/jdbc/lams-ds";
-
-	private static final String PASSWORD_QUERY = "select password from lams_user where login=?";
 	
 	private static IWikiService wikiService = null;
 	
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.9 -r1.10
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	3 Jun 2008 03:44:08 -0000	1.9
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	12 Jun 2008 03:03:07 -0000	1.10
@@ -227,6 +227,7 @@
 		sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_REVERT_PAGES,wiki.isAllowRevertPage());
+		sessionMap.put(WikiConstants.ATTR_MAXIMUM_REPLIES,wiki.getMaximumReply());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_INSTRUCTION,wiki.getReflectInstructions());
Index: lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	21 May 2008 05:02:10 -0000	1.5
+++ lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	12 Jun 2008 03:03:07 -0000	1.6
@@ -138,7 +138,7 @@
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
 							<c:if
-								test='${(sessionMap.mode == "teacher") || (not sessionMap.finishedLock && (empty msgDto.mark))}'>
+								test='${ (sessionMap.mode == "teacher") || (not sessionMap.finishedLock && (empty msgDto.mark) && (msgDto.message.replyNumber < sessionMap.maximumReplies)) }'>
 								<c:set var="edittopic">
 									<html:rewrite
 										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />