Index: lams_tool_nb/conf/war/META-INF/MANIFEST.MF =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/conf/war/META-INF/Attic/MANIFEST.MF,v diff -u -r1.1 -r1.2 --- lams_tool_nb/conf/war/META-INF/MANIFEST.MF 7 Jun 2005 05:52:19 -0000 1.1 +++ lams_tool_nb/conf/war/META-INF/MANIFEST.MF 14 Jul 2005 02:27:18 -0000 1.2 @@ -1 +1 @@ -Class-Path: ./lams.jar ./lams-tool-noticeboard.jar \ No newline at end of file +Class-Path: ./lams.jar ./lams-tool-nb.jar \ No newline at end of file Index: lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/db/sql/Attic/insert_lams_tool_nb_data.sql,v diff -u -r1.3 -r1.4 --- lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql 5 Jul 2005 06:46:21 -0000 1.3 +++ lams_tool_nb/db/sql/insert_lams_tool_nb_data.sql 14 Jul 2005 02:26:50 -0000 1.4 @@ -38,7 +38,7 @@ LAST_INSERT_ID(), now(), now(), - 'NOT_ATTEMPTED'); + 'INCOMPLETE'); INSERT INTO tl_lanb11_user ( uid, user_id, Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java,v diff -u -r1.1 -r1.2 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java 7 Jun 2005 05:50:05 -0000 1.1 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServiceProxy.java 14 Jul 2005 02:22:02 -0000 1.2 @@ -47,6 +47,4 @@ WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); return wac.getBean("nbService"); } - - } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/Attic/NbAuthoringUtil.java,v diff -u -r1.2 -r1.3 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java 15 Jun 2005 05:40:21 -0000 1.2 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbAuthoringUtil.java 14 Jul 2005 02:22:21 -0000 1.3 @@ -26,8 +26,6 @@ /** * @author mtruong * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates */ public class NbAuthoringUtil { @@ -44,7 +42,9 @@ return contentId; } - + /* + * Not needed anymore, using ActionForm to persist the values + */ public static void cleanSession(HttpServletRequest request) { request.getSession().removeAttribute(NoticeboardConstants.TOOL_CONTENT_ID); Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbLearnerUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/Attic/NbLearnerUtil.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbLearnerUtil.java 14 Jul 2005 02:22:21 -0000 1.1 @@ -0,0 +1,42 @@ +/* + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * + *This program is free software; you can redistribute it and/or modify + *it under the terms of the GNU General Public License as published by + *the Free Software Foundation; either version 2 of the License, or + *(at your option) any later version. + * + *This program is distributed in the hope that it will be useful, + *but WITHOUT ANY WARRANTY; without even the implied warranty of + *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + *GNU General Public License for more details. + * + *You should have received a copy of the GNU General Public License + *along with this program; if not, write to the Free Software + *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + *USA + * + *http://www.gnu.org/licenses/gpl.txt + */ +package org.lamsfoundation.lams.tool.noticeboard.util; + +import javax.servlet.http.HttpServletRequest; +import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants; + +/** + * @author mtruong + * + * Date created: 30 June 2005 + */ +public class NbLearnerUtil { + + private NbLearnerUtil() {} + + public static void cleanSession(HttpServletRequest request) + { + request.getSession().removeAttribute(NoticeboardConstants.READ_ONLY_MODE); + // request.getSession().removeAttribute(NoticeboardConstants.IS_TOOL_COMPLETED); + } + + +} Index: lams_tool_nb/web/authoringIndex.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/Attic/authoringIndex.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_nb/web/authoringIndex.jsp 28 Jun 2005 07:36:58 -0000 1.1 +++ lams_tool_nb/web/authoringIndex.jsp 14 Jul 2005 02:29:45 -0000 1.2 @@ -13,7 +13,7 @@ - Noticeboard Starter Page + Noticeboard Author Starter Page Index: lams_tool_nb/web/learnerContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/learnerContent.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_nb/web/learnerContent.jsp 6 Jul 2005 00:04:26 -0000 1.1 +++ lams_tool_nb/web/learnerContent.jsp 14 Jul 2005 02:29:45 -0000 1.2 @@ -25,8 +25,8 @@
- - + +
Index: lams_tool_nb/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.2 -r1.3 --- lams_tool_nb/web/WEB-INF/struts-config.xml 6 Jul 2005 00:02:11 -0000 1.2 +++ lams_tool_nb/web/WEB-INF/struts-config.xml 14 Jul 2005 02:31:15 -0000 1.3 @@ -48,6 +48,7 @@ name="NbLearnerForm" scope="session" input=".learnerStarter" + parameter="mode" unknown="false" validate="false" > @@ -56,6 +57,11 @@ path=".learnerContent" redirect="false" /> +