Index: lams_tool_wiki_orig/db/sql/insert_lams_tool_wiki_data.sql =================================================================== diff -u -re8343e8d676900d059435abdef072abc89d3b26b -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/db/sql/insert_lams_tool_wiki_data.sql (.../insert_lams_tool_wiki_data.sql) (revision e8343e8d676900d059435abdef072abc89d3b26b) +++ lams_tool_wiki_orig/db/sql/insert_lams_tool_wiki_data.sql (.../insert_lams_tool_wiki_data.sql) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -1,6 +1,6 @@ -- $Id$ insert into tl_lawiki10_wiki (ID,TITLE, ALLOWANNOMITY, FORCEOFFLINE, LOCKWHENFINISHED, INSTRUCTIONS, -ONLINEINSTRUCTIONS, OFFLINEINSTRUCTIONS) VALUES (1, "TEST FORUM", false, false, false, "TEST INSTRUCTIONS", "TEST ONLINE INSTRUCTIONS", "TEST OFFLINE INSTRUCTIONS"); +ONLINEINSTRUCTIONS, OFFLINEINSTRUCTIONS) VALUES (1, "TEST WIKI", false, false, false, "TEST INSTRUCTIONS", "TEST ONLINE INSTRUCTIONS", "TEST OFFLINE INSTRUCTIONS"); -insert into tl_lawiki10_message (ID, SUBJECT, BODY, ISAUTHORED, ISANNONYMOUS, FORUM, PARENT) VALUES (2, "TITLE", "BODY", true, false, 1, NULL) ; +insert into tl_lawiki10_message (ID, SUBJECT, BODY, ISAUTHORED, ISANNONYMOUS, WIKI, PARENT) VALUES (2, "TITLE", "BODY", true, false, 1, NULL) ; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/WikiDao.java =================================================================== diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/WikiDao.java (.../WikiDao.java) (revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/WikiDao.java (.../WikiDao.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -35,7 +35,7 @@ * */ public class WikiDao extends HibernateDaoSupport { - private static final String FIND_FORUM_BY_CONTENTID = "from Wiki wiki where wiki.contentId=?"; + private static final String FIND_WIKI_BY_CONTENTID = "from Wiki wiki where wiki.contentId=?"; public void saveOrUpdate(Wiki wiki) { wiki.updateModificationData(); @@ -58,7 +58,7 @@ } public Wiki getByContentId(Long contentID) { - List list = getHibernateTemplate().find(FIND_FORUM_BY_CONTENTID,contentID); + List list = getHibernateTemplate().find(FIND_WIKI_BY_CONTENTID,contentID); if(list != null && list.size() > 0) return (Wiki) list.get(0); else Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -24,7 +24,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.wiki.service; -import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_FORUM_STYLE; +import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_WIKI_STYLE; import java.io.FileNotFoundException; import java.io.IOException; @@ -387,7 +387,7 @@ Iterator iter = topicsBySession.iterator(); while(iter.hasNext()){ msg = (Message) iter.next(); - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) map.put(msg.getCreated(),msg); else map.put(msg.getLastReplyDate(),msg); Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/DateComparator.java =================================================================== diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/DateComparator.java (.../DateComparator.java) (revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/DateComparator.java (.../DateComparator.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -27,11 +27,11 @@ import java.util.Comparator; import java.util.Date; -import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_FORUM_STYLE; +import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_WIKI_STYLE; public class DateComparator implements Comparator { public int compare(Date arg0, Date arg1) { - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) return (arg0.getTime() - arg1.getTime()) > 0 ?1:-1; else return (arg0.getTime() - arg1.getTime()) > 0 ?-1:1; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/TopicComparator.java =================================================================== diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/TopicComparator.java (.../TopicComparator.java) (revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/TopicComparator.java (.../TopicComparator.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -30,7 +30,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.wiki.persistence.Message; import org.lamsfoundation.lams.tool.wiki.persistence.MessageSeq; -import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_FORUM_STYLE; +import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_WIKI_STYLE; /** * This class implementaion java.util.Comparator interface. It can sort meesage according to @@ -79,7 +79,7 @@ //this comparation will handle different branch node if(parent1 != parent2){ //compare last modified date, the latest is at beginning - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) return parent1.getUpdated().before(parent2.getUpdated())?-1:1; else return parent1.getUpdated().before(parent2.getUpdated())?1:-1; @@ -90,15 +90,15 @@ if(msgSeq1.getMessageLevel() != msgSeq2.getMessageLevel()) return msgSeq1.getMessageLevel() -msgSeq2.getMessageLevel(); else{ - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) return msg1.getUpdated().before(msg2.getUpdated())?-1:1; else return msg1.getUpdated().before(msg2.getUpdated())?1:-1; } } } - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) return msg1.getUpdated().before(msg2.getUpdated())?-1:1; else return msg1.getUpdated().before(msg2.getUpdated())?1:-1; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java =================================================================== diff -u -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java (.../WikiConstants.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -38,13 +38,13 @@ // For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc. // For new style (Ernie's early desc): Most current popular wiki used style: latest topics // should be at the top, reply date will descide the order etc. - public static final boolean OLD_FORUM_STYLE = true; + public static final boolean OLD_WIKI_STYLE = true; public static final int STATUS_CONTENT_COPYED = 1; public static final int SESSION_STATUS_FINISHED = 1; public final static int MAX_FILE_SIZE = 250 * 1000; - public final static String FORUM_SERVICE = "wikiService"; + public final static String WIKI_SERVICE = "wikiService"; public final static String CONTENT_HANDLER = "toolContentHandler"; @@ -57,7 +57,7 @@ public static final String DEFAULT_TITLE = "Wiki"; //TODO:hard code!!! need to read from config public static final String TOOL_URL_BASE = "/lams/tool/lawiki10/"; - public static final String FORUM_ID = "wiki_id"; + public static final String WIKI_ID = "wiki_id"; public static final String ATTR_ALLOW_UPLOAD = "allowUpload"; public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages"; @@ -91,8 +91,8 @@ public static final String ATTR_ROOT_TOPIC_UID = "rootUid"; - public static final String ATTR_FORUM_TITLE = "title"; - public static final String ATTR_FORUM_INSTRCUTION = "instruction"; + public static final String ATTR_WIKI_TITLE = "title"; + public static final String ATTR_WIKI_INSTRCUTION = "instruction"; public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList"; public static final String ATTR_TOPIC = "topic"; @@ -120,7 +120,7 @@ public static final String MARK_UPDATE_FROM_SESSION = "listAllMarks"; public static final String MARK_UPDATE_FROM_USER = "listMarks"; - public static final String MARK_UPDATE_FROM_FORUM = "viewWiki"; + public static final String MARK_UPDATE_FROM_WIKI = "viewWiki"; Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java =================================================================== diff -u -rb31bd8c734cb34384750a4bc9d9bf01bc5fe2588 -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java (.../WikiLinkHandlerServlet.java) (revision b31bd8c734cb34384750a4bc9d9bf01bc5fe2588) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java (.../WikiLinkHandlerServlet.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -20,7 +20,7 @@ */ package org.lamsfoundation.lams.tool.wiki.web; -import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_FORUM_STYLE; +import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_WIKI_STYLE; import java.io.IOException; import java.io.PrintWriter; @@ -91,7 +91,7 @@ // For old style (Fiona's description): The oldest topic is at the top, does not depends the reply date etc. // For new style (Ernie's early desc): Most current popular wiki used style: latest topics // should be at the top, reply date will descide the order etc. - public static final boolean OLD_FORUM_STYLE = true; + public static final boolean OLD_WIKI_STYLE = true; /** Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java =================================================================== diff -u -rf2f0e879f2156a87414da2ee71c3c6fe10a8ac18 -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision f2f0e879f2156a87414da2ee71c3c6fe10a8ac18) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -25,7 +25,7 @@ package org.lamsfoundation.lams.tool.wiki.web.actions; -import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_FORUM_STYLE; +import static org.lamsfoundation.lams.tool.wiki.util.WikiConstants.OLD_WIKI_STYLE; import java.io.IOException; import java.util.ArrayList; @@ -621,7 +621,7 @@ message.setAttachments(attSet); //save the new message into HttpSession - if(OLD_FORUM_STYLE) + if(OLD_WIKI_STYLE) topics.add(MessageDTO.getMessageDTO(message)); else topics.add(0,MessageDTO.getMessageDTO(message)); @@ -822,7 +822,7 @@ private IWikiService getWikiManager() { if ( wikiService == null ) { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext()); - wikiService = (IWikiService) wac.getBean(WikiConstants.FORUM_SERVICE); + wikiService = (IWikiService) wac.getBean(WikiConstants.WIKI_SERVICE); } return wikiService; } Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ExportServlet.java =================================================================== diff -u -r51ab92ac37624b5c280cbd5f3ae8e3972b8540ff -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ExportServlet.java (.../ExportServlet.java) (revision 51ab92ac37624b5c280cbd5f3ae8e3972b8540ff) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ExportServlet.java (.../ExportServlet.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -155,7 +155,7 @@ sessionMap.put(WikiConstants.ATTR_TOOL_CONTENT_TOPICS, sessionTopicMap); //set wiki title - sessionMap.put(WikiConstants.ATTR_FORUM_TITLE, session.getWiki().getTitle()); + sessionMap.put(WikiConstants.ATTR_WIKI_TITLE, session.getWiki().getTitle()); } @@ -193,7 +193,7 @@ sessionMap.put(WikiConstants.ATTR_TOOL_CONTENT_TOPICS,topicsByUser); // set wiki title - sessionMap.put(WikiConstants.ATTR_FORUM_TITLE, content.getTitle()); + sessionMap.put(WikiConstants.ATTR_WIKI_TITLE, content.getTitle()); } /** Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java =================================================================== diff -u -ra0cb40afd5688f43dc89a3cc70f202ff7c00569f -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision a0cb40afd5688f43dc89a3cc70f202ff7c00569f) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java (.../LearningAction.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -218,7 +218,7 @@ entryText = notebookEntry.getEntry(); } - sessionMap.put(WikiConstants.FORUM_ID, wikiId); + sessionMap.put(WikiConstants.WIKI_ID, wikiId); sessionMap.put(AttributeNames.ATTR_MODE, mode); sessionMap.put(WikiConstants.ATTR_FINISHED_LOCK, new Boolean(lock)); sessionMap.put(WikiConstants.ATTR_USER_FINISHED, wikiUser.isSessionFinished()); @@ -234,8 +234,8 @@ sessionMap.put(WikiConstants.ATTR_REFLECTION_INSTRUCTION,wiki.getReflectInstructions()); sessionMap.put(WikiConstants.ATTR_REFLECTION_ENTRY, entryText); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); - sessionMap.put(WikiConstants.ATTR_FORUM_TITLE,wiki.getTitle()); - sessionMap.put(WikiConstants.ATTR_FORUM_INSTRCUTION,wiki.getInstructions()); + sessionMap.put(WikiConstants.ATTR_WIKI_TITLE,wiki.getTitle()); + sessionMap.put(WikiConstants.ATTR_WIKI_INSTRCUTION,wiki.getInstructions()); // get all root topic to display on init page List rootTopics = wikiService.getRootTopics(sessionId); @@ -445,7 +445,7 @@ MessageForm messageForm = (MessageForm) form; SessionMap sessionMap = getSessionMap(request, messageForm); - Long wikiId = (Long) sessionMap.get(WikiConstants.FORUM_ID); + Long wikiId = (Long) sessionMap.get(WikiConstants.WIKI_ID); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); Message message = messageForm.getMessage(); @@ -841,7 +841,7 @@ .getRequiredWebApplicationContext(getServlet() .getServletContext()); wikiService = (IWikiService) wac - .getBean(WikiConstants.FORUM_SERVICE); + .getBean(WikiConstants.WIKI_SERVICE); } return wikiService; } Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java =================================================================== diff -u -r6c72248f23c28bfb1413f1fba6aae48bc393d7b7 -radd116f9af357e74cbd2fac156232300a1bf7f35 --- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 6c72248f23c28bfb1413f1fba6aae48bc393d7b7) +++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision add116f9af357e74cbd2fac156232300a1bf7f35) @@ -677,7 +677,7 @@ String updateMode = (String) sessionMap.get(WikiConstants.PARAM_UPDATE_MODE); //view wiki mode if(StringUtils.isBlank(updateMode)){ - sessionMap.put(WikiConstants.PARAM_UPDATE_MODE, WikiConstants.MARK_UPDATE_FROM_FORUM); + sessionMap.put(WikiConstants.PARAM_UPDATE_MODE, WikiConstants.MARK_UPDATE_FROM_WIKI); sessionMap.put(WikiConstants.ATTR_ROOT_TOPIC_UID,markForm.getTopicID()); } @@ -803,7 +803,7 @@ .getRequiredWebApplicationContext(getServlet() .getServletContext()); wikiService = (IWikiService) wac - .getBean(WikiConstants.FORUM_SERVICE); + .getBean(WikiConstants.WIKI_SERVICE); } return wikiService; }