Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Attachment.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml 11 Oct 2005 07:22:57 -0000 1.1
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml 13 Oct 2005 02:06:08 -0000 1.2
@@ -13,7 +13,7 @@
@@ -26,11 +26,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Message.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 11 Oct 2005 07:22:57 -0000 1.1
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 13 Oct 2005 02:06:08 -0000 1.2
@@ -13,7 +13,7 @@
@@ -30,63 +30,63 @@
type="java.util.Date"
update="true"
insert="true"
- column="CREATED"
+ column="create_date"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/db/model/forum.clay
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/model/forum.clay,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/db/model/forum.clay 11 Oct 2005 07:22:57 -0000 1.3
+++ lams_tool_forum/db/model/forum.clay 13 Oct 2005 02:06:08 -0000 1.4
@@ -1,5 +1,5 @@
-
+
@@ -14,13 +14,13 @@
-
+
-
+
-
+
@@ -29,11 +29,11 @@
-
+
-
+
@@ -42,24 +42,25 @@
-
+
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
-
+
@@ -71,49 +72,63 @@
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,18 +137,18 @@
-
+
-
+
-
+
@@ -142,11 +157,11 @@
-
+
-
+
@@ -155,11 +170,11 @@
-
+
-
+
@@ -168,62 +183,89 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
-
-
+
-
+
-
+
-
+
@@ -232,23 +274,11 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -257,11 +287,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -270,29 +313,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -301,24 +383,37 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -327,11 +422,11 @@
-
+
-
+
@@ -343,8 +438,8 @@
-
+
@@ -353,11 +448,11 @@
-
+
-
+
@@ -369,48 +464,119 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
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.1 -r1.2
--- lams_tool_forum/db/sql/table-schema.sql 11 Oct 2005 07:22:57 -0000 1.1
+++ lams_tool_forum/db/sql/table-schema.sql 13 Oct 2005 02:06:08 -0000 1.2
@@ -3,43 +3,66 @@
alter table tl_lafrum11_message drop foreign key FK4A6067E89EAD680D;
drop table if exists tl_lafrum11_attachment;
drop table if exists tl_lafrum11_forum;
+drop table if exists tl_lafrum11_forum_learners;
drop table if exists tl_lafrum11_message;
+drop table if exists tl_lafrum11_tool_session;
create table tl_lafrum11_attachment (
- UUID bigint not null auto_increment,
- VERSION bigint,
+ uuid bigint not null auto_increment,
+ version_id bigint,
type varchar(255),
- NAME varchar(255),
+ file_name varchar(255),
forum bigint,
- primary key (UUID)
+ primary key (uuid)
);
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)
+ uuid 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,
+ tool_content_id bigint,
+ primary key (uuid)
);
+create table tl_lafrum11_forum_learners (
+ uuid bigint not null auto_increment,
+ user_id bigint,
+ status bit,
+ session_id bigint,
+ fullName varchar(255),
+ userName varchar(255),
+ primary key (uuid)
+);
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,
+ uuid 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 bigint,
parent bigint,
- primary key (UUID)
+ primary key (uuid)
);
-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 (
+ uuid bigint not null auto_increment,
+ sessionEndDate datetime,
+ sessionStartDate datetime,
+ status integer,
+ toolContentId bigint,
+ toolSessionId bigint,
+ primary key (uuid)
+);
+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);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Attachment.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml 11 Oct 2005 07:22:57 -0000 1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml 13 Oct 2005 02:06:08 -0000 1.2
@@ -13,7 +13,7 @@
@@ -26,11 +26,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Learner.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Learner.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Learner.java 13 Oct 2005 02:06:08 -0000 1.1
@@ -0,0 +1,135 @@
+/*
+ *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.forum.persistence;
+
+import java.io.Serializable;
+
+import org.apache.log4j.Logger;
+/**
+ *
+ * @hibernate.class table="tl_lafrum11_forum_learners"
+ * @author Steve.Ni
+ *
+ * @version $Revision: 1.1 $
+ * @serialData -7043502180037866257L
+ */
+public class Learner implements Serializable,Cloneable{
+
+ private static final long serialVersionUID = -7043502180037866257L;
+
+ private static Logger log = Logger.getLogger(Learner.class);
+
+ private Long uuid;
+ private Long userID;
+ private String userName;
+ private String fullName;
+ private Long sessionID;
+ private boolean status;
+
+ /**
+ * @hibernate.id generator-class="identity" type="java.lang.Long" column="uuid"
+ * @return Returns the uuid.
+ */
+ public Long getUuid() {
+ return uuid;
+ }
+ /**
+ * @param uuid The uuid to set.
+ */
+ public void setUuid(Long learnerID) {
+ this.uuid = learnerID;
+ }
+
+ /**
+ * @hibernate.property column="user_id" length="20"
+ * @return Returns the userID.
+ */
+ public Long getUserID() {
+ return userID;
+ }
+ /**
+ * @param userID
+ * The userID to set.
+ */
+ public void setUserID(Long userID) {
+ this.userID = userID;
+ }
+ /**
+ * @hibernate.property column="status" length="1"
+ * @return Returns the status.
+ */
+ public boolean isStatus() {
+ return status;
+ }
+ /**
+ * @param status The status to set.
+ */
+ public void setStatus(boolean finished) {
+ this.status = finished;
+ }
+ /* (non-Javadoc)
+ * @see java.lang.Object#clone()
+ */
+ public Object clone() {
+
+ Object obj = null;
+ try {
+ obj = super.clone();
+ } catch (CloneNotSupportedException e) {
+ log.error("When clone " + Learner.class + " failed");
+ }
+ return obj;
+ }
+ /**
+ * @hibernate.property column="session_id" length="20"
+ * @return Returns the sessionID.
+ */
+ public Long getSessionID() {
+ return sessionID;
+ }
+ /**
+ * @param sessionID The sessionID to set.
+ */
+ public void setSessionID(Long sessionID) {
+ this.sessionID = sessionID;
+ }
+ /**
+ * @hibernate.property length="255"
+ * @return
+ */
+ public String getFullName() {
+ return fullName;
+ }
+ public void setFullName(String fullName) {
+ this.fullName = fullName;
+ }
+ /**
+ * @hibernate.property length="255"
+ * @return
+ */
+ public String getUserName() {
+ return userName;
+ }
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Message.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 11 Oct 2005 07:22:57 -0000 1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 13 Oct 2005 02:06:08 -0000 1.2
@@ -13,7 +13,7 @@
@@ -30,63 +30,63 @@
type="java.util.Date"
update="true"
insert="true"
- column="CREATED"
+ column="create_date"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ToolSession.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ToolSession.java 13 Oct 2005 02:06:08 -0000 1.1
@@ -0,0 +1,102 @@
+/*
+ *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.forum.persistence;
+
+import java.util.Date;
+
+/**
+ * @hibernate.class table="tl_lafrum11_tool_session"
+ * @author Steve.Ni
+ *
+ * @version $Revision: 1.1 $
+ */
+public class ToolSession {
+ private Long uuid;
+ private Long toolSessionId;
+ private Long toolContentId;
+ private Date sessionStartDate;
+ private Date sessionEndDate;
+ private int status;
+
+ /**
+ * @hibernate.id generator-class="identity" type="java.lang.Long" column="uuid"
+ * @return Returns the learnerID.
+ */
+ public Long getUuid() {
+ return uuid;
+ }
+ public void setUuid(Long uuid) {
+ this.uuid = uuid;
+ }
+
+ /**
+ * @hibernate.property
+ * @return
+ */
+ public Date getSessionEndDate() {
+ return sessionEndDate;
+ }
+ public void setSessionEndDate(Date sessionEndDate) {
+ this.sessionEndDate = sessionEndDate;
+ }
+ /**
+ * @hibernate.property
+ * @return
+ */
+ public Date getSessionStartDate() {
+ return sessionStartDate;
+ }
+ public void setSessionStartDate(Date sessionStartDate) {
+ this.sessionStartDate = sessionStartDate;
+ }
+ /**
+ * @hibernate.property
+ * @return
+ */
+ public int getStatus() {
+ return status;
+ }
+ public void setStatus(int status) {
+ this.status = status;
+ }
+ /**
+ * @hibernate.property
+ * @return
+ */
+ public Long getToolContentId() {
+ return toolContentId;
+ }
+ public void setToolContentId(Long toolContentId) {
+ this.toolContentId = toolContentId;
+ }
+ /**
+ * @hibernate.property
+ * @return
+ */
+ public Long getToolSessionId() {
+ return toolSessionId;
+ }
+ public void setToolSessionId(Long toolSessionId) {
+ this.toolSessionId = toolSessionId;
+ }
+
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/Attic/ForumManagerImpl.java,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java 11 Oct 2005 07:22:57 -0000 1.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImpl.java 13 Oct 2005 02:06:08 -0000 1.8
@@ -59,8 +59,8 @@
reloaded.setTitle(forum.getTitle());
reloaded.setCreatedBy(forum.getCreatedBy());
reloaded.setLockWhenFinished(forum.getLockWhenFinished());
- reloaded.setForceOffline(forum.getForceOffline());
- reloaded.setAllowAnnomity(forum.getAllowAnnomity());
+ reloaded.setRunOffline(forum.getRunOffline());
+ reloaded.setAllowAnonym(forum.getAllowAnonym());
reloaded.setInstructions(forum.getInstructions());
reloaded.setOnlineInstructions(forum.getOnlineInstructions());
reloaded.setOfflineInstructions(forum.getOfflineInstructions());
@@ -118,7 +118,7 @@
public Message editMessage(Message message) throws PersistenceException {
Message reloaded = this.getMessage(message.getUuid());
reloaded.setModifiedBy(message.getModifiedBy());
- reloaded.setIsAnnonymous(message.getIsAnnonymous());
+ reloaded.setIsAnnonymous(message.getIsAnonymous());
reloaded.setIsAuthored(message.getIsAuthored());
reloaded.setSubject(message.getSubject());
reloaded.setBody(message.getBody());
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumTest.java,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java 11 Oct 2005 07:22:57 -0000 1.6
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/ForumTest.java 13 Oct 2005 02:06:08 -0000 1.7
@@ -27,8 +27,8 @@
Forum entity = new Forum();
entity.setTitle("Lams Forum");
entity.setLockWhenFinished(false);
- entity.setForceOffline(true);
- entity.setAllowAnnomity(true);
+ entity.setRunOffline(true);
+ entity.setAllowAnonym(true);
entity.setCreatedBy(new Long("1000"));
Set attachments = new HashSet();
@@ -59,8 +59,8 @@
assertEquals("date difference in database and memory", entity.getUpdated().getTime()/1000, reloaded.getUpdated().getTime()/1000);
assertEquals("title should be Lams Forum", "Lams Forum", reloaded.getTitle());
assertEquals("lockWhenFinished should be false", false, reloaded.getLockWhenFinished());
- assertEquals("forceOffline should be true", true, reloaded.getForceOffline());
- assertEquals("allowAnnomity should be true", true, reloaded.getAllowAnnomity());
+ assertEquals("forceOffline should be true", true, reloaded.getRunOffline());
+ assertEquals("allowAnnomity should be true", true, reloaded.getAllowAnonym());
//validate attachment relations
assertEquals("should have 1 attachments", 1, reloaded.getAttachments().size());
Set reloadedSet = reloaded.getAttachments();
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/MessageTest.java,v
diff -u -r1.4 -r1.5
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java 12 Oct 2005 00:03:51 -0000 1.4
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/persistence/MessageTest.java 13 Oct 2005 02:06:08 -0000 1.5
@@ -56,7 +56,7 @@
assertEquals("reloaded message body should be: Test Message", "Test Message", reloaded.getBody());
assertEquals("reloaded message Subject should be: Test Message", "Test Message", reloaded.getSubject());
assertEquals("reloaded message Forum not equal", forum.getUuid(), reloaded.getForum().getUuid());
- assertEquals("reloaded message isAnnonymous not equal", false, reloaded.getIsAnnonymous());
+ assertEquals("reloaded message isAnnonymous not equal", false, reloaded.getIsAnonymous());
assertEquals("reloaded message isAuthored not equal", true, reloaded.getIsAuthored());
assertEquals("reloaded message createdBy not equal", new Long(1000), reloaded.getCreatedBy());
assertEquals("reloaded message modifiedBy not equal", new Long(1002), reloaded.getModifiedBy());
@@ -80,7 +80,7 @@
assertEquals("reloaded message body should be: Test Message", "Test Message2", reloaded2.getBody());
assertEquals("reloaded message Subject should be: Test Message", "Test Message2", reloaded2.getSubject());
assertEquals("reloaded message Forum not equal", forum.getUuid(), reloaded2.getForum().getUuid());
- assertEquals("reloaded message isAnnonymous not equal", true, reloaded2.getIsAnnonymous());
+ assertEquals("reloaded message isAnnonymous not equal", true, reloaded2.getIsAnonymous());
assertEquals("reloaded message isAuthored not equal", true, reloaded2.getIsAuthored());
assertEquals("reloaded message createdBy not equal", new Long(1005), reloaded2.getCreatedBy());
assertEquals("reloaded message modifiedBy not equal", new Long(1006), reloaded2.getModifiedBy());
Index: lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/Attic/ForumManagerImplTest.java,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java 12 Oct 2005 01:44:31 -0000 1.8
+++ lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/service/ForumManagerImplTest.java 13 Oct 2005 02:06:08 -0000 1.9
@@ -35,8 +35,8 @@
assertEquals(reloadedForum.getTitle(), "TEST");
assertEquals(reloadedForum.getCreatedBy(), new Long("1002"));
assertEquals(reloadedForum.getLockWhenFinished(), true);
- assertEquals(reloadedForum.getForceOffline(), true);
- assertEquals(reloadedForum.getAllowAnnomity(), false);
+ assertEquals(reloadedForum.getRunOffline(), true);
+ assertEquals(reloadedForum.getAllowAnonym(), false);
assertEquals(reloadedForum.getInstructions(), "TEST INSTRUCTIONS");
assertEquals(reloadedForum.getOnlineInstructions(), "TEST ONLINEINSTRUCTIONS");
assertEquals(reloadedForum.getOfflineInstructions(), "TEST OFFLINEINSTRUCTIONS");
@@ -60,8 +60,8 @@
assertEquals(reloadedForum.getTitle(), "TEST");
assertEquals(reloadedForum.getCreatedBy(), new Long("1002"));
assertEquals(reloadedForum.getLockWhenFinished(), true);
- assertEquals(reloadedForum.getForceOffline(), true);
- assertEquals(reloadedForum.getAllowAnnomity(), false);
+ assertEquals(reloadedForum.getRunOffline(), true);
+ assertEquals(reloadedForum.getAllowAnonym(), false);
assertEquals(reloadedForum.getInstructions(), "TEST INSTRUCTIONS");
assertEquals(reloadedForum.getOnlineInstructions(), "TEST ONLINEINSTRUCTIONS");
assertEquals(reloadedForum.getOfflineInstructions(), "TEST OFFLINEINSTRUCTIONS");
@@ -84,8 +84,8 @@
assertEquals(reloadedForum.getTitle(), "TEST");
assertEquals(reloadedForum.getCreatedBy(), new Long("1002"));
assertEquals(reloadedForum.getLockWhenFinished(), false);
- assertEquals(reloadedForum.getForceOffline(), false);
- assertEquals(reloadedForum.getAllowAnnomity(), false);
+ assertEquals(reloadedForum.getRunOffline(), false);
+ assertEquals(reloadedForum.getAllowAnonym(), false);
assertEquals(reloadedForum.getInstructions(), "");
assertEquals(reloadedForum.getOnlineInstructions(), "");
assertEquals(reloadedForum.getOfflineInstructions(), "");
@@ -110,7 +110,7 @@
assertEquals(reloaded.getForum(), forum);
assertEquals(reloaded.getCreatedBy(), new Long("1002"));
- assertEquals(reloaded.getIsAnnonymous(), true);
+ assertEquals(reloaded.getIsAnonymous(), true);
assertEquals(reloaded.getIsAuthored(), true);
assertEquals(reloaded.getSubject(), "TEST");
assertEquals(reloaded.getBody(), "TEST");
@@ -125,7 +125,7 @@
assertEquals(message.getForum(), forum);
assertEquals(message.getCreatedBy(), new Long("1002"));
assertEquals(message.getModifiedBy(), new Long("1004"));
- assertEquals(message.getIsAnnonymous(), false);
+ assertEquals(message.getIsAnonymous(), false);
assertEquals(message.getSubject(), "MODIFIED SUBJECT");
assertEquals(message.getBody(), "MODIFIED BODY");
@@ -147,7 +147,7 @@
Message reloaded = forumManager.getMessage(message.getUuid());
assertEquals(reloaded.getForum(), forum);
assertEquals(reloaded.getCreatedBy(), new Long("1002"));
- assertEquals(reloaded.getIsAnnonymous(), true);
+ assertEquals(reloaded.getIsAnonymous(), true);
assertEquals(reloaded.getIsAuthored(), true);
assertEquals(reloaded.getSubject(), "TEST");
assertEquals(reloaded.getBody(), "TEST");
@@ -157,7 +157,7 @@
reply = forumManager.getMessage(reply.getUuid());
assertEquals(message.getForum(), forum);
assertEquals(reply.getCreatedBy(), new Long("1008"));
- assertEquals(reply.getIsAnnonymous(), true);
+ assertEquals(reply.getIsAnonymous(), true);
assertEquals(reply.getIsAuthored(), false);
assertEquals(reply.getSubject(), "REPLY MESSAGE");
assertEquals(reply.getBody(), "REPLY MESSAGE");
@@ -201,8 +201,8 @@
forum.setTitle(title);
forum.setCreatedBy(createdBy);
forum.setLockWhenFinished(lockWhenFinished);
- forum.setForceOffline(forceOffLine);
- forum.setAllowAnnomity(allowAnnomity);
+ forum.setRunOffline(forceOffLine);
+ forum.setAllowAnonym(allowAnnomity);
forum.setInstructions(instructions);
forum.setOfflineInstructions(offlineInstructions);
forum.setOnlineInstructions(onlineInstructions);