<bean:message key="appName" />

Index: lams_tool_forum/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/.classpath,v diff -u -r1.4 -r1.5 --- lams_tool_forum/.classpath 14 Oct 2005 02:03:53 -0000 1.4 +++ lams_tool_forum/.classpath 19 Oct 2005 05:55:58 -0000 1.5 @@ -1,6 +1,6 @@ - + Index: lams_tool_forum/.project =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/.project,v diff -u -r1.1 -r1.2 --- lams_tool_forum/.project 8 Jul 2005 02:49:16 -0000 1.1 +++ lams_tool_forum/.project 19 Oct 2005 05:55:58 -0000 1.2 @@ -40,4 +40,11 @@ com.genuitec.eclipse.j2eedt.core.webnature org.eclipse.jdt.core.javanature + + + JBOSS4-Forum + 2 + D:/jboss-4.0.2/server/default/deploy/lams.ear/lams-tool-lafrum11.war/WEB-INF/classes + + Index: lams_tool_forum/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/build.xml,v diff -u -r1.27 -r1.28 --- lams_tool_forum/build.xml 17 Oct 2005 05:29:20 -0000 1.27 +++ lams_tool_forum/build.xml 19 Oct 2005 05:55:58 -0000 1.28 @@ -285,7 +285,7 @@ - +------------------------------------------+ Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v diff -u -r1.4 -r1.5 --- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 17 Oct 2005 05:29:19 -0000 1.4 +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 19 Oct 2005 05:55:59 -0000 1.5 @@ -147,6 +147,7 @@ update="true" insert="true" column="content_id" + unique="true" /> + + + + + + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + parameter="newTopic"> + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + + + - - - + parameter="openForum" scope="request"> + - - - + parameter="openTopic" scope="request"> + - - - + parameter="getMessage" scope="request"> + - - - + + + - - - + name="messageForm" validate="true" input="tiles:/learning/message/post" + parameter="reply" scope="request"> + - - - + - - - + parameter="deleteMessage" scope="request"> + - - + + + + + + + + + Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/create_lams_tool_forum.sql,v diff -u -r1.4 -r1.5 --- lams_tool_forum/db/sql/create_lams_tool_forum.sql 12 Oct 2005 01:44:30 -0000 1.4 +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql 19 Oct 2005 05:55:59 -0000 1.5 @@ -1,39 +1,67 @@ +SET FOREIGN_KEY_CHECKS=0; create table tl_lafrum11_attachment ( - UUID bigint not null auto_increment, - VERSION bigint, + uid bigint not null auto_increment, + version_id bigint, type varchar(255), - NAME varchar(255), - forum bigint, - primary key (UUID) + file_name varchar(255), + uuid bigint, + forum_uid bigint, + message_uid bigint, + primary key (uid) ); create table tl_lafrum11_forum ( - UUID bigint not null auto_increment, - CREATED datetime, - UPDATED datetime, - CREATEDBY bigint, - TITLE varchar(255), - ALLOWANNOMITY bit, - FORCEOFFLINE bit, - LOCKWHENFINISHED bit, - INSTRUCTIONS varchar(255), - ONLINEINSTRUCTIONS varchar(255), - OFFLINEINSTRUCTIONS varchar(255), - primary key (UUID) + uid bigint not null auto_increment, + create_date datetime, + update_date datetime, + create_by bigint, + title varchar(255), + allow_anonym bit, + run_offline bit, + lock_on_finished bit, + instructions varchar(255), + online_instructions varchar(255), + offline_instructions varchar(255), + content_in_use bit, + define_later bit, + content_id bigint, + primary key (uid) ); +create table tl_lafrum11_forum_user ( + uid bigint not null auto_increment, + user_id bigint, + status bit, + full_name varchar(255), + user_name varchar(255), + primary key (uid) +); create table tl_lafrum11_message ( - UUID bigint not null auto_increment, - CREATED datetime, - UPDATED datetime, - CREATEDBY bigint, - MODIFIEDBY bigint, - SUBJECT varchar(255), - BODY text, - ISAUTHORED bit, - ISANNONYMOUS bit, - FORUM bigint, - parent bigint, - primary key (UUID) + uid bigint not null auto_increment, + create_date datetime, + update_date datetime, + create_by bigint, + modified_by bigint, + subject varchar(255), + body text, + is_authored bit, + is_anonymous bit, + forum_session_uid bigint, + user_uid bigint, + parent_uid bigint, + primary key (uid) ); -alter table tl_lafrum11_attachment add index FK389AD9A29EAD680D (forum), add constraint FK389AD9A29EAD680D foreign key (forum) references tl_lafrum11_forum (UUID); -alter table tl_lafrum11_message add index FK4A6067E8F7440FBC (parent), add constraint FK4A6067E8F7440FBC foreign key (parent) references tl_lafrum11_message (UUID); -alter table tl_lafrum11_message add index FK4A6067E89EAD680D (FORUM), add constraint FK4A6067E89EAD680D foreign key (FORUM) references tl_lafrum11_forum (UUID); +create table tl_lafrum11_tool_session ( + uid bigint not null auto_increment, + session_end_date datetime, + session_start_date datetime, + status integer, + forum_uid bigint, + session_id bigint, + primary key (uid) +); +alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid); +alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); +alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid); +alter table tl_lafrum11_message add index FK4A6067E8C6FF3C72 (forum_session_uid), add constraint FK4A6067E8C6FF3C72 foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid); +alter table tl_lafrum11_message add index FK4A6067E8B0A7E6B3 (user_uid), add constraint FK4A6067E8B0A7E6B3 foreign key (user_uid) references tl_lafrum11_forum_user (uid); +alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_forum/db/sql/drop_lams_tool_forum.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/drop_lams_tool_forum.sql,v diff -u -r1.5 -r1.6 --- lams_tool_forum/db/sql/drop_lams_tool_forum.sql 12 Oct 2005 01:44:30 -0000 1.5 +++ lams_tool_forum/db/sql/drop_lams_tool_forum.sql 19 Oct 2005 05:55:59 -0000 1.6 @@ -1,7 +1,9 @@ SET FOREIGN_KEY_CHECKS=0; drop table if exists tl_lafrum11_attachment; drop table if exists tl_lafrum11_forum; +drop table if exists tl_lafrum11_forum_user; drop table if exists tl_lafrum11_message; +drop table if exists tl_lafrum11_tool_session; SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_forum/db/sql/table-schema.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/table-schema.sql,v diff -u -r1.4 -r1.5 --- lams_tool_forum/db/sql/table-schema.sql 17 Oct 2005 05:29:20 -0000 1.4 +++ lams_tool_forum/db/sql/table-schema.sql 19 Oct 2005 05:55:59 -0000 1.5 @@ -33,7 +33,7 @@ offline_instructions varchar(255), content_in_use bit, define_later bit, - content_id bigint, + content_id bigint unique, primary key (uid) ); create table tl_lafrum11_forum_user ( Index: lams_tool_forum/src/java/forumApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/Attic/forumApplicationContext.xml,v diff -u -r1.10 -r1.11 --- lams_tool_forum/src/java/forumApplicationContext.xml 14 Oct 2005 06:23:48 -0000 1.10 +++ lams_tool_forum/src/java/forumApplicationContext.xml 19 Oct 2005 05:55:58 -0000 1.11 @@ -13,6 +13,8 @@ org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml + org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml + org/lamsfoundation/lams/tool/forum/persistence/ToolSession.hbm.xml @@ -42,7 +44,7 @@ - + Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/Attic/PersistenceException.java,v diff -u -r1.1 -r1.2 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java 17 Jun 2005 04:01:28 -0000 1.1 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/core/PersistenceException.java 19 Oct 2005 05:55:59 -0000 1.2 @@ -1,15 +1,15 @@ package org.lamsfoundation.lams.tool.forum.core; /** - * Created by IntelliJ IDEA. * User: conradb * Date: 6/06/2005 * Time: 10:51:43 - * To change this template use File | Settings | File Templates. */ -public class PersistenceException extends Exception { +public class PersistenceException extends RuntimeException { - public PersistenceException(String message) { + private static final long serialVersionUID = 3903937111808861090L; + + public PersistenceException(String message) { super(message); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v diff -u -r1.4 -r1.5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 17 Oct 2005 05:29:19 -0000 1.4 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 19 Oct 2005 05:55:58 -0000 1.5 @@ -147,6 +147,7 @@ update="true" insert="true" column="content_id" + unique="true" /> - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + parameter="newTopic"> + - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + parameter="openForum" scope="request"> + - - - + parameter="openTopic" scope="request"> + - - - + parameter="getMessage" scope="request"> + - - - + + - - - + name="messageForm" validate="true" input="tiles:/learning/message/post" + parameter="reply" scope="request"> + - - - + - - - + parameter="deleteMessage" scope="request"> + + + + + Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v diff -u -r1.3 -r1.4 --- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 22 Jul 2005 05:56:44 -0000 1.3 +++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 19 Oct 2005 05:55:59 -0000 1.4 @@ -15,28 +15,17 @@ at the top of the page --> - - - - - - - - - - - - - - - - + + + + + @@ -83,12 +72,7 @@ - - - - - Index: lams_tool_forum/web/includes/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/Attic/header.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_forum/web/includes/header.jsp 13 Sep 2005 04:14:41 -0000 1.3 +++ lams_tool_forum/web/includes/header.jsp 19 Oct 2005 05:55:59 -0000 1.4 @@ -1,19 +1,11 @@ <%@ include file="/includes/taglibs.jsp" %> <% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../../../.."; + String LAMS_WEB_ROOT="/lams"; %> <bean:message key="appName" /> - - - + + Index: lams_tool_forum/web/includes/layout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/layout.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/includes/layout.jsp 22 Jul 2005 05:54:17 -0000 1.2 +++ lams_tool_forum/web/includes/layout.jsp 19 Oct 2005 05:55:59 -0000 1.3 @@ -1,23 +1,20 @@ -<%@ include file="/includes/taglibs.jsp" %> -<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ include file="/includes/taglibs.jsp"%> +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles"%> - + - - - - - - - - - + + + + +

+ + + +

- - - - - + + + Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/style.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/tabsLayout.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/includes/taglibs.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/Attic/taglibs.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/includes/taglibs.jsp 22 Jul 2005 05:54:17 -0000 1.2 +++ lams_tool_forum/web/includes/taglibs.jsp 19 Oct 2005 05:55:59 -0000 1.3 @@ -2,4 +2,6 @@ <%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> Index: lams_tool_forum/web/jsps/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/authoring.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/jsps/authoring/authoring.jsp 14 Oct 2005 06:23:47 -0000 1.2 +++ lams_tool_forum/web/jsps/authoring/authoring.jsp 19 Oct 2005 05:55:59 -0000 1.3 @@ -23,7 +23,7 @@ - + @@ -67,7 +67,6 @@ - <%@ include file="basic.jsp"%> <%@ include file="instructions.jsp"%> <%@ include file="advance.jsp"%> Index: lams_tool_forum/web/jsps/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/basic.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/jsps/authoring/basic.jsp 14 Oct 2005 06:23:47 -0000 1.2 +++ lams_tool_forum/web/jsps/authoring/basic.jsp 19 Oct 2005 05:55:59 -0000 1.3 @@ -1,52 +1,66 @@ + + +

+ + + + + + + + + + + + + + + + - -

:
:	+ +
+ <%@ include file="/jsps/message/topiclist.jsp" %> +
+ ');"> + + +

- - - - - - - - - - - - - -

:
:	- -

- - - - - -

- -

- - - - - - - - - - -

Topic	-
-	- - - -

- -

+ + + + + + + + + + + + + + Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editAdvanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editBasic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/editInstructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/forum/includes/instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_forum/web/jsps/authoring/message/create.jsp 22 Jul 2005 06:52:07 -0000 1.5 +++ lams_tool_forum/web/jsps/authoring/message/create.jsp 19 Oct 2005 05:55:58 -0000 1.6 @@ -1,13 +1,13 @@ <%@ include file="/includes/taglibs.jsp" %> -<%@ include file="/includes/messages.jsp" %>

+ onsubmit="return validateMessageForm(this);" >

-<%@ include file="includes/form.jsp" %> +<%@ include file="/jsps/message/topiclist.jsp" %> +<%@ include file="/jsps/message/form.jsp" %>

Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/authoring/message/includes/form.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/message/form.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/form.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/message/form.jsp 19 Oct 2005 05:55:59 -0000 1.1 @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + +

	*


+ +

Index: lams_tool_forum/web/jsps/message/topiclist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/message/Attic/topiclist.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/message/topiclist.jsp 19 Oct 2005 05:55:59 -0000 1.1 @@ -0,0 +1,17 @@ +

+ + + + + + + + + + +

Topic	+
	+ +