Index: lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	20 Aug 2008 05:55:52 -0000	1.2
@@ -85,5 +85,9 @@
 instructions.offlineInstructions  =Offline Instructions:
 instructions.onlineInstructions  =Online Instructions:
 
-
+label.authoring.basic.dimdimSettings = Dimdim Settings
+label.authoring.basic.maxParticipants = Maximum Participants
+label.authoring.basic.meetingDurationInHours = Meeting Duration in hours
+label.authoring.basic.allowVideo = Allow Video
+label.authoring.basic.attendeeMikes  = Attendee Mikes
 #======= End labels: Exported 78 labels for en AU =====
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimUserDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -32,6 +32,7 @@
  * implemented by the Hibernate or other implementation.
  */
 public interface IDimdimUserDAO extends IBaseDAO {
+
 	/**
 	 * 
 	 * @param userId
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -31,5 +31,4 @@
  * DAO for accessing the Dimdim objects - Hibernate specific code.
  */
 public class DimdimDAO extends BaseDAO implements IDimdimDAO {
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimSessionDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -31,5 +31,4 @@
  * DAO for accessing the DimdimSession objects - Hibernate specific code.
  */
 public class DimdimSessionDAO extends BaseDAO implements IDimdimSessionDAO {
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/AttachmentDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -31,14 +31,6 @@
 
 public class AttachmentDTO implements Comparable<AttachmentDTO> {
 
-	public AttachmentDTO(DimdimAttachment att) {
-		this.fileUuid = att.getFileUuid();
-		this.fileName = att.getFileName();
-		this.fileVersionId = att.getFileVersionId();
-		this.createDate = att.getCreateDate();
-		this.uid = att.getUid();
-	}
-
 	Long uid;
 
 	Long fileUuid;
@@ -49,6 +41,22 @@
 
 	Date createDate;
 
+	public AttachmentDTO(DimdimAttachment att) {
+		this.fileUuid = att.getFileUuid();
+		this.fileName = att.getFileName();
+		this.fileVersionId = att.getFileVersionId();
+		this.createDate = att.getCreateDate();
+		this.uid = att.getUid();
+	}
+
+	public int compareTo(AttachmentDTO other) {
+		int ret = this.createDate.compareTo(other.getCreateDate());
+		if (ret == 0) {
+			ret = this.uid.compareTo(other.getUid());
+		}
+		return ret;
+	}
+
 	public String getFileName() {
 		return fileName;
 	}
@@ -88,12 +96,4 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
-
-	public int compareTo(AttachmentDTO other) {
-		int ret = this.createDate.compareTo(other.getCreateDate());
-		if (ret == 0) {
-			ret = this.uid.compareTo(other.getUid());
-		}
-		return ret;
-	}
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/ContentDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -36,7 +36,7 @@
 
 public class ContentDTO {
 
-	private static Logger logger = Logger.getLogger(ContentDTO.class);
+	private static final Logger logger = Logger.getLogger(ContentDTO.class);
 
 	public Long toolContentId;
 
@@ -63,7 +63,15 @@
 	public Set<SessionDTO> sessionDTOs = new TreeSet<SessionDTO>();
 
 	public Long currentTab;
+	
+	public Integer maxParticipants;
 
+	public  Integer meetingDurationInHours;
+
+	public  boolean allowVideo;
+
+	public  Integer attendeeMikes;
+
 	/* Constructors */
 	public ContentDTO() {
 	}
@@ -97,7 +105,7 @@
 			if (attSet != null)
 				attSet.add(new AttachmentDTO(att));
 		}
-		
+
 		for (DimdimSession dimdimSession : dimdim.getDimdimSessions()) {
 			sessionDTOs.add(new SessionDTO(dimdimSession));
 		}
@@ -201,4 +209,36 @@
 	public void setCurrentTab(Long currentTab) {
 		this.currentTab = currentTab;
 	}
+
+	public Integer getMaxParticipants() {
+		return maxParticipants;
+	}
+
+	public void setMaxParticipants(Integer maxParticipants) {
+		this.maxParticipants = maxParticipants;
+	}
+
+	public Integer getMeetingDurationInHours() {
+		return meetingDurationInHours;
+	}
+
+	public void setMeetingDurationInHours(Integer meetingDurationInHours) {
+		this.meetingDurationInHours = meetingDurationInHours;
+	}
+
+	public boolean isAllowVideo() {
+		return allowVideo;
+	}
+
+	public void setAllowVideo(boolean allowVideo) {
+		this.allowVideo = allowVideo;
+	}
+
+	public Integer getAttendeeMikes() {
+		return attendeeMikes;
+	}
+
+	public void setAttendeeMikes(Integer attendeeMikes) {
+		this.attendeeMikes = attendeeMikes;
+	}
 }
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/DimdimUserDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/NotebookEntryDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -52,5 +52,4 @@
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/SessionDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -37,7 +37,7 @@
 
 	String sessionName;
 
-	Set<DimdimUserDTO> userDTOs = new TreeSet<DimdimUserDTO>();
+	Set<UserDTO> userDTOs = new TreeSet<UserDTO>();
 
 	int numberOfLearners;
 
@@ -50,7 +50,7 @@
 		numberOfFinishedLearners = 0;
 
 		for (DimdimUser dimdimUser : session.getDimdimUsers()) {
-			DimdimUserDTO userDTO = new DimdimUserDTO(dimdimUser);
+			UserDTO userDTO = new UserDTO(dimdimUser);
 			if (userDTO.getEntryUID() != null) {
 				numberOfFinishedLearners++;
 			}
@@ -61,6 +61,14 @@
 
 	}
 
+	public int compareTo(SessionDTO other) {
+		int ret = this.sessionName.compareToIgnoreCase(other.sessionName);
+		if (ret == 0) {
+			ret = this.sessionID.compareTo(other.sessionID);
+		}
+		return ret;
+	}
+
 	public SessionDTO() {
 	}
 
@@ -80,19 +88,11 @@
 		this.sessionName = sessionName;
 	}
 
-	public int compareTo(SessionDTO other) {
-		int ret = this.sessionName.compareToIgnoreCase(other.sessionName);
-		if (ret == 0) {
-			ret = this.sessionID.compareTo(other.sessionID);
-		}
-		return ret;
-	}
-
-	public Set<DimdimUserDTO> getUserDTOs() {
+	public Set<UserDTO> getUserDTOs() {
 		return userDTOs;
 	}
 
-	public void setUserDTOs(Set<DimdimUserDTO> dimdimUsers) {
+	public void setUserDTOs(Set<UserDTO> dimdimUsers) {
 		this.userDTOs = dimdimUsers;
 	}
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/UserDTO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java	20 Aug 2008 05:55:52 -0000	1.1
@@ -0,0 +1,129 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id: UserDTO.java,v 1.1 2008/08/20 05:55:52 asukkar Exp $ */
+
+package org.lamsfoundation.lams.tool.dimdim.dto;
+
+import org.lamsfoundation.lams.notebook.model.NotebookEntry;
+import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
+
+public class UserDTO implements Comparable<UserDTO> {
+
+	public Long uid;
+
+	public String loginName;
+
+	public String firstName;
+
+	public String lastName;
+
+	public boolean finishedActivity;
+
+	public NotebookEntryDTO entryDTO;
+
+	public Long entryUID;
+
+	public UserDTO(DimdimUser user, NotebookEntry entry) {
+		this.uid = user.getUid();
+		this.loginName = user.getLoginName();
+		this.firstName = user.getFirstName();
+		this.lastName = user.getLastName();
+		this.finishedActivity = user.isFinishedActivity();
+		this.entryUID = user.getEntryUID();
+		this.entryDTO = new NotebookEntryDTO(entry);
+	}
+
+	public UserDTO(DimdimUser user) {
+		this.uid = user.getUid();
+		this.loginName = user.getLoginName();
+		this.firstName = user.getFirstName();
+		this.lastName = user.getLastName();
+		this.finishedActivity = user.isFinishedActivity();
+		this.entryUID = user.getEntryUID();
+	}
+
+	public int compareTo(UserDTO other) {
+		int ret = this.lastName.compareToIgnoreCase(other.lastName);
+		if (ret == 0) {
+			ret = this.uid.compareTo(other.uid);
+		}
+		return ret;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public Long getUid() {
+		return uid;
+	}
+
+	public void setUid(Long uid) {
+		this.uid = uid;
+	}
+
+	public NotebookEntryDTO getEntryDTO() {
+		return entryDTO;
+	}
+
+	public void setEntryDTO(NotebookEntryDTO entryDTO) {
+		this.entryDTO = entryDTO;
+	}
+
+	public Long getEntryUID() {
+		return entryUID;
+	}
+
+	public void setEntryUID(Long entryUID) {
+		this.entryUID = entryUID;
+	}
+
+	public boolean isFinishedActivity() {
+		return finishedActivity;
+	}
+
+	public void setFinishedActivity(boolean finishedActivity) {
+		this.finishedActivity = finishedActivity;
+	}
+}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/Dimdim.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -30,25 +30,23 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
-import org.lamsfoundation.lams.tool.dimdim.service.DimdimService;
 
 /**
+ * 
+ * 
  * @hibernate.class table="tl_laddim10_dimdim"
  */
 
 public class Dimdim implements java.io.Serializable, Cloneable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 579733009969321015L;
 
-	static Logger log = Logger.getLogger(DimdimService.class.getName());
+	private static final Logger logger = Logger.getLogger(Dimdim.class);
 
-	// Fields
-	/**
-	 * 
-	 */
+	private IToolContentHandler toolContentHandler;
+
+	// Persistent Fields
+
 	private Long uid;
 
 	private Date createDate;
@@ -89,9 +87,6 @@
 
 	private Integer attendeeMikes;
 
-	// *********** NON Persistent fields
-	private IToolContentHandler toolContentHandler;
-
 	// Constructors
 
 	/** default constructor */
@@ -453,7 +448,7 @@
 			dimdim.dimdimSessions = new HashSet<DimdimSession>();
 
 		} catch (CloneNotSupportedException cnse) {
-			log.error("Error cloning " + Dimdim.class);
+			logger.error("Error cloning " + Dimdim.class);
 		}
 		return dimdim;
 	}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimAttachment.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -40,16 +40,13 @@
 
 public class DimdimAttachment implements java.io.Serializable, Cloneable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 47452859888067500L;
 
-	private static final Logger log = Logger.getLogger(DimdimAttachment.class);
+	private static final Logger logger = Logger
+			.getLogger(DimdimAttachment.class);
 
-	/**
-	 * 
-	 */
+	// Fields
+	
 	private Long uid;
 
 	private Long fileVersionId;
@@ -222,7 +219,7 @@
 			obj = super.clone();
 			((DimdimAttachment) obj).setUid(null);
 		} catch (CloneNotSupportedException e) {
-			log.error("Failed to clone " + DimdimAttachment.class);
+			logger.error("Failed to clone " + DimdimAttachment.class);
 		}
 
 		return obj;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimSession.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -39,13 +39,12 @@
 
 public class DimdimSession implements java.io.Serializable {
 
-	private static Logger log = Logger.getLogger(DimdimSession.class);
-	/**
-	 * 
-	 */
+	private static final Logger logger = Logger.getLogger(DimdimSession.class);
+
 	private static final long serialVersionUID = 4407078136514639026L;
 
 	// Fields
+	
 	private Long uid;
 
 	private Date sessionEndDate;
@@ -241,7 +240,7 @@
 			session = (DimdimSession) super.clone();
 			session.dimdimUsers = new HashSet<DimdimUser>();
 		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + DimdimSession.class + " failed");
+			logger.error("When clone " + DimdimSession.class + " failed");
 		}
 		return session;
 	}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimUser.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -37,12 +37,10 @@
 
 public class DimdimUser implements java.io.Serializable {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -3701664859818409197L;
 
-	// Fields
+	// Persistent Fields
+	
 	private Long uid;
 
 	private Long userId;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -68,7 +68,7 @@
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimAttachment;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimSession;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
-import org.lamsfoundation.lams.tool.dimdim.util.DimdimConstants;
+import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.tool.dimdim.util.DimdimException;
 import org.lamsfoundation.lams.tool.dimdim.util.DimdimToolContentHandler;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
@@ -89,7 +89,7 @@
 public class DimdimService implements ToolSessionManager, ToolContentManager,
 		IDimdimService, ToolContentImport102Manager {
 
-	static Logger logger = Logger.getLogger(DimdimService.class.getName());
+	private static final Logger logger = Logger.getLogger(DimdimService.class);
 
 	private IDimdimDAO dimdimDAO = null;
 
@@ -357,7 +357,7 @@
 	}
 
 	public Dimdim getDefaultContent() {
-		Long defaultContentID = getDefaultContentIdBySignature(DimdimConstants.TOOL_SIGNATURE);
+		Long defaultContentID = getDefaultContentIdBySignature(Constants.TOOL_SIGNATURE);
 		Dimdim defaultContent = getDimdimByContentId(defaultContentID);
 		if (defaultContent == null) {
 			String error = "Could not retrieve default content record for this tool";
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/Constants.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java	20 Aug 2008 05:55:52 -0000	1.1
@@ -0,0 +1,49 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * 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.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $$Id: Constants.java,v 1.1 2008/08/20 05:55:52 asukkar Exp $$ */
+
+package org.lamsfoundation.lams.tool.dimdim.util;
+
+public interface Constants {
+	public static final String TOOL_SIGNATURE = "laddim10";
+
+	// Authoring SessionMap key names
+	public static final String KEY_TOOL_CONTENT_ID = "toolContentID";
+	public static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
+	public static final String KEY_MODE = "mode";
+	public static final String KEY_ONLINE_FILES = "onlineFiles";
+	public static final String KEY_OFFLINE_FILES = "offlineFiles";
+	public static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
+	public static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
+	public static final String KEY_DELETED_FILES = "deletedFiles";
+
+	// Attribute names
+	public static final String ATTR_CONTENT_DTO = "contentDTO";
+	public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID";
+	public static final String ATTR_FINISHED_ACTIVITY = "finishedActivity";
+	public static final String ATTR_SESSION_MAP = "sessionMap";
+	public static final String ATTR_USER_DTO = "userDTO";
+	
+	// Parameter names
+	public static final String PARAM_USER_UID = "userUID";
+}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimConstants.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/DimdimException.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -31,9 +31,6 @@
  */
 public class DimdimException extends RuntimeException {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -5518806968051758859L;
 
 	public DimdimException(String message) {
@@ -53,5 +50,4 @@
 		super(cause);
 
 	}
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/Attic/AdminAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -44,9 +44,9 @@
  * 
  * @struts.action path="/admin/saveConfig" name="adminForm"
  *                parameter="saveConfig" scope="request" validate="false"
- * @struts.action-forward  name="saveConfig" path="tiles:/admin/saveConfig"
+ * @struts.action-forward name="saveConfig" path="tiles:/admin/saveConfig"
  * 
- * @author asukkar
+ * @author Anthony Sukkar
  * 
  */
 public class AdminAction extends MappingDispatchAction {
@@ -57,20 +57,17 @@
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
+		
+		// set up dimdimService
+		dimdimService = DimdimServiceProxy.getDimdimService(this.getServlet()
+				.getServletContext());
 
-		if (dimdimService == null) {
-			dimdimService = DimdimServiceProxy.getDimdimService(this
-					.getServlet().getServletContext());
-		}
-
 		return super.execute(mapping, form, request, response);
 	}
 
 	public ActionForward editConfig(ActionMapping mapping, ActionForm form,
 			ServletRequest request, ServletResponse response) throws Exception {
-		
-		
-		
+
 		return mapping.findForward("editConfig-success");
 	}
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -24,21 +24,26 @@
 
 package org.lamsfoundation.lams.tool.dimdim.web.actions;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.DispatchAction;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.authoring.web.AuthoringConstants;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
@@ -47,11 +52,10 @@
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimAttachment;
 import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy;
 import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService;
-import org.lamsfoundation.lams.tool.dimdim.util.DimdimConstants;
+import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.tool.dimdim.web.forms.AuthoringForm;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
@@ -65,37 +69,36 @@
  * @struts.action-forward name="success" path="tiles:/authoring/main"
  * @struts.action-forward name="message_page" path="tiles:/generic/message"
  */
-public class AuthoringAction extends LamsDispatchAction {
+public class AuthoringAction extends DispatchAction {
 
-	// private static Logger logger = Logger.getLogger(AuthoringAction.class);
+	private static final Logger logger = Logger
+			.getLogger(AuthoringAction.class);
 
-	public IDimdimService dimdimService;
+	private IDimdimService dimdimService;
 
-	// Authoring SessionMap key names
-	private static final String KEY_TOOL_CONTENT_ID = "toolContentID";
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
 
-	private static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
+		// set up dimdimService
+		dimdimService = DimdimServiceProxy.getDimdimService(this.getServlet()
+				.getServletContext());
 
-	private static final String KEY_MODE = "mode";
+		return super.execute(mapping, form, request, response);
+	}
 
-	private static final String KEY_ONLINE_FILES = "onlineFiles";
-
-	private static final String KEY_OFFLINE_FILES = "offlineFiles";
-
-	private static final String KEY_UNSAVED_ONLINE_FILES = "unsavedOnlineFiles";
-
-	private static final String KEY_UNSAVED_OFFLINE_FILES = "unsavedOfflineFiles";
-
-	private static final String KEY_DELETED_FILES = "deletedFiles";
-
 	/**
 	 * Default method when no dispatch parameter is specified. It is expected
 	 * that the parameter <code>toolContentID</code> will be passed in. This
 	 * will be used to retrieve content for this tool.
 	 * 
+	 * @throws ServletException
+	 * 
 	 */
 	protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
-			HttpServletRequest request, HttpServletResponse response) {
+			HttpServletRequest request, HttpServletResponse response)
+			throws ServletException {
 
 		// Extract toolContentID from parameters.
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
@@ -104,15 +107,9 @@
 		String contentFolderID = WebUtil.readStrParam(request,
 				AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode",
-				true);
+		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,
+				AttributeNames.PARAM_MODE, true);
 
-		// set up dimdimService
-		if (dimdimService == null) {
-			dimdimService = DimdimServiceProxy.getDimdimService(this
-					.getServlet().getServletContext());
-		}
-
 		// retrieving Dimdim with given toolContentID
 		Dimdim dimdim = dimdimService.getDimdimByContentId(toolContentID);
 		if (dimdim == null) {
@@ -124,15 +121,15 @@
 
 		if (mode != null && mode.isTeacher()) {
 			// Set the defineLater flag so that learners cannot use content
-			// while we
-			// are editing. This flag is released when updateContent is called.
+			// while we are editing. This flag is released when updateContent is
+			// called.
 			dimdim.setDefineLater(true);
 			dimdimService.saveOrUpdateDimdim(dimdim);
 		}
 
 		// Set up the authForm.
 		AuthoringForm authForm = (AuthoringForm) form;
-		updateAuthForm(authForm, dimdim);
+		copyProperties(authForm, dimdim);
 
 		// Set up sessionMap
 		SessionMap<String, Object> map = createSessionMap(dimdim,
@@ -141,7 +138,7 @@
 
 		// add the sessionMap to HTTPSession.
 		request.getSession().setAttribute(map.getSessionID(), map);
-		request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
+		request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 
 		return mapping.findForward("success");
 	}
@@ -156,26 +153,27 @@
 
 		// get dimdim content.
 		Dimdim dimdim = dimdimService.getDimdimByContentId((Long) map
-				.get(KEY_TOOL_CONTENT_ID));
+				.get(Constants.KEY_TOOL_CONTENT_ID));
 
 		// update dimdim content using form inputs.
-		ToolAccessMode mode = (ToolAccessMode) map.get(KEY_MODE);
-		updateDimdim(dimdim, authForm, mode);
+		ToolAccessMode mode = (ToolAccessMode) map.get(Constants.KEY_MODE);
+		copyProperties(dimdim, authForm, mode);
 
 		// remove attachments marked for deletion.
 		Set<DimdimAttachment> attachments = dimdim.getDimdimAttachments();
 		if (attachments == null) {
 			attachments = new HashSet<DimdimAttachment>();
 		}
 
-		for (DimdimAttachment att : getAttList(KEY_DELETED_FILES, map)) {
+		for (DimdimAttachment att : getAttList(Constants.KEY_DELETED_FILES, map)) {
 			// remove from db, leave in repository
 			attachments.remove(att);
 		}
 
 		// add unsaved attachments
-		attachments.addAll(getAttList(KEY_UNSAVED_ONLINE_FILES, map));
-		attachments.addAll(getAttList(KEY_UNSAVED_OFFLINE_FILES, map));
+		attachments.addAll(getAttList(Constants.KEY_UNSAVED_ONLINE_FILES, map));
+		attachments
+				.addAll(getAttList(Constants.KEY_UNSAVED_OFFLINE_FILES, map));
 
 		// set attachments in case it didn't exist
 		dimdim.setDimdimAttachments(attachments);
@@ -194,7 +192,7 @@
 		// add the sessionMapID to form
 		authForm.setSessionMapID(map.getSessionID());
 
-		request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
+		request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 
 		return mapping.findForward("success");
 	}
@@ -248,21 +246,21 @@
 		List<DimdimAttachment> savedFiles;
 		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
 			file = (FormFile) authForm.getOfflineFile();
-			unsavedFiles = getAttList(KEY_UNSAVED_OFFLINE_FILES, map);
+			unsavedFiles = getAttList(Constants.KEY_UNSAVED_OFFLINE_FILES, map);
 
-			savedFiles = getAttList(KEY_OFFLINE_FILES, map);
+			savedFiles = getAttList(Constants.KEY_OFFLINE_FILES, map);
 		} else {
 			file = (FormFile) authForm.getOnlineFile();
-			unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
+			unsavedFiles = getAttList(Constants.KEY_UNSAVED_ONLINE_FILES, map);
 
-			savedFiles = getAttList(KEY_ONLINE_FILES, map);
+			savedFiles = getAttList(Constants.KEY_ONLINE_FILES, map);
 		}
 
 		// validate file max size
 		ActionMessages errors = new ActionMessages();
 		FileValidatorUtil.validateFileSize(file, true, errors);
 		if (!errors.isEmpty()) {
-			request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
+			request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 			this.saveErrors(request, errors);
 			return mapping.findForward("success");
 		}
@@ -271,7 +269,7 @@
 
 			// upload file to repository
 			DimdimAttachment newAtt = dimdimService.uploadFileToContent(
-					(Long) map.get(KEY_TOOL_CONTENT_ID), file, type);
+					(Long) map.get(Constants.KEY_TOOL_CONTENT_ID), file, type);
 
 			// Add attachment to unsavedFiles
 			// check to see if file with same name exists
@@ -284,15 +282,14 @@
 						&& StringUtils.equals(currAtt.getFileType(), newAtt
 								.getFileType())) {
 					// move from this this list to deleted list.
-					getAttList(KEY_DELETED_FILES, map).add(currAtt);
+					getAttList(Constants.KEY_DELETED_FILES, map).add(currAtt);
 					iter.remove();
 					break;
 				}
 			}
 			unsavedFiles.add(newAtt);
 
-			request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
-			request.setAttribute("unsavedChanges", new Boolean(true));
+			request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 		}
 		return mapping.findForward("success");
 	}
@@ -303,9 +300,9 @@
 
 		List<DimdimAttachment> fileList;
 		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			fileList = getAttList(KEY_OFFLINE_FILES, map);
+			fileList = getAttList(Constants.KEY_OFFLINE_FILES, map);
 		} else {
-			fileList = getAttList(KEY_ONLINE_FILES, map);
+			fileList = getAttList(Constants.KEY_ONLINE_FILES, map);
 		}
 
 		Iterator<DimdimAttachment> iter = fileList.iterator();
@@ -315,16 +312,15 @@
 
 			if (att.getFileUuid().equals(authForm.getDeleteFileUuid())) {
 				// move to delete file list, deleted at next updateContent
-				getAttList(KEY_DELETED_FILES, map).add(att);
+				getAttList(Constants.KEY_DELETED_FILES, map).add(att);
 
 				// remove from this list
 				iter.remove();
 				break;
 			}
 		}
 
-		request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
+		request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 
 		return mapping.findForward("success");
 	}
@@ -336,9 +332,9 @@
 		List<DimdimAttachment> unsavedFiles;
 
 		if (StringUtils.equals(IToolContentHandler.TYPE_OFFLINE, type)) {
-			unsavedFiles = getAttList(KEY_UNSAVED_OFFLINE_FILES, map);
+			unsavedFiles = getAttList(Constants.KEY_UNSAVED_OFFLINE_FILES, map);
 		} else {
-			unsavedFiles = getAttList(KEY_UNSAVED_ONLINE_FILES, map);
+			unsavedFiles = getAttList(Constants.KEY_UNSAVED_ONLINE_FILES, map);
 		}
 
 		Iterator<DimdimAttachment> iter = unsavedFiles.iterator();
@@ -354,8 +350,7 @@
 			}
 		}
 
-		request.setAttribute(DimdimConstants.ATTR_SESSION_MAP, map);
-		request.setAttribute("unsavedChanges", new Boolean(true));
+		request.setAttribute(Constants.ATTR_SESSION_MAP, map);
 
 		return mapping.findForward("success");
 	}
@@ -367,15 +362,22 @@
 	 * @param mode
 	 * @return
 	 */
-	private void updateDimdim(Dimdim dimdim, AuthoringForm authForm,
+	private void copyProperties(Dimdim dimdim, AuthoringForm authForm,
 			ToolAccessMode mode) {
 		dimdim.setTitle(authForm.getTitle());
 		dimdim.setInstructions(authForm.getInstructions());
 		if (mode.isAuthor()) { // Teacher cannot modify following
-			dimdim.setOfflineInstructions(authForm.getOnlineInstruction());
-			dimdim.setOnlineInstructions(authForm.getOfflineInstruction());
+			dimdim.setOfflineInstructions(authForm.getOfflineInstruction());
+			dimdim.setOnlineInstructions(authForm.getOnlineInstruction());
 			dimdim.setLockOnFinished(authForm.isLockOnFinished());
 			dimdim.setAllowRichEditor(authForm.isAllowRichEditor());
+
+			// TODO check whether these fields should be in here
+			dimdim.setMaxParticipants(authForm.getMaxParticipants());
+			dimdim.setMeetingDurationInHours(authForm
+					.getMeetingDurationInHours());
+			dimdim.setAllowVideo(authForm.isAllowVideo());
+			dimdim.setAttendeeMikes(authForm.getAttendeeMikes());
 		}
 	}
 
@@ -385,14 +387,17 @@
 	 * @param dimdim
 	 * @param authForm
 	 * @return
+	 * @throws ServletException
 	 */
-	private void updateAuthForm(AuthoringForm authForm, Dimdim dimdim) {
-		authForm.setTitle(dimdim.getTitle());
-		authForm.setInstructions(dimdim.getInstructions());
-		authForm.setOnlineInstruction(dimdim.getOnlineInstructions());
-		authForm.setOfflineInstruction(dimdim.getOfflineInstructions());
-		authForm.setLockOnFinished(dimdim.isLockOnFinished());
-		authForm.setAllowRichEditor(dimdim.isAllowRichEditor());
+	private void copyProperties(AuthoringForm authForm, Dimdim dimdim)
+			throws ServletException {
+		try {
+			BeanUtils.copyProperties(authForm, dimdim);
+		} catch (IllegalAccessException e) {
+			throw new ServletException(e);
+		} catch (InvocationTargetException e) {
+			throw new ServletException(e);
+		}
 	}
 
 	/**
@@ -406,22 +411,28 @@
 
 		SessionMap<String, Object> map = new SessionMap<String, Object>();
 
-		map.put(KEY_MODE, mode);
-		map.put(KEY_CONTENT_FOLDER_ID, contentFolderID);
-		map.put(KEY_TOOL_CONTENT_ID, toolContentID);
-		map.put(KEY_ONLINE_FILES, new LinkedList<DimdimAttachment>());
-		map.put(KEY_OFFLINE_FILES, new LinkedList<DimdimAttachment>());
-		map.put(KEY_UNSAVED_ONLINE_FILES, new LinkedList<DimdimAttachment>());
-		map.put(KEY_UNSAVED_OFFLINE_FILES, new LinkedList<DimdimAttachment>());
-		map.put(KEY_DELETED_FILES, new LinkedList<DimdimAttachment>());
+		map.put(Constants.KEY_MODE, mode);
+		map.put(Constants.KEY_CONTENT_FOLDER_ID, contentFolderID);
+		map.put(Constants.KEY_TOOL_CONTENT_ID, toolContentID);
+		map.put(Constants.KEY_ONLINE_FILES, new LinkedList<DimdimAttachment>());
+		map
+				.put(Constants.KEY_OFFLINE_FILES,
+						new LinkedList<DimdimAttachment>());
+		map.put(Constants.KEY_UNSAVED_ONLINE_FILES,
+				new LinkedList<DimdimAttachment>());
+		map.put(Constants.KEY_UNSAVED_OFFLINE_FILES,
+				new LinkedList<DimdimAttachment>());
+		map
+				.put(Constants.KEY_DELETED_FILES,
+						new LinkedList<DimdimAttachment>());
 
 		for (DimdimAttachment attachment : dimdim.getDimdimAttachments()) {
 			String type = attachment.getFileType();
 			if (type.equals(IToolContentHandler.TYPE_OFFLINE)) {
-				getAttList(KEY_OFFLINE_FILES, map).add(attachment);
+				getAttList(Constants.KEY_OFFLINE_FILES, map).add(attachment);
 			}
 			if (type.equals(IToolContentHandler.TYPE_ONLINE)) {
-				getAttList(KEY_ONLINE_FILES, map).add(attachment);
+				getAttList(Constants.KEY_ONLINE_FILES, map).add(attachment);
 			}
 		}
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/Attic/ClearSessionAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -33,8 +33,10 @@
  * This class give a chance to clear HttpSession when user save/close authoring
  * page.
  * 
- * @author Steve.Ni ----------------XDoclet Tags--------------------
+ * @author Steve.Ni
  * 
+ * ----------------XDoclet Tags--------------------
+ * 
  * @struts:action path="/clearsession" validate="false"
  * 
  * @version $Revision$
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -33,6 +33,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
@@ -43,61 +44,63 @@
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
 import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy;
 import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService;
-import org.lamsfoundation.lams.tool.dimdim.util.DimdimConstants;
+import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.tool.dimdim.util.DimdimException;
 import org.lamsfoundation.lams.tool.dimdim.web.forms.LearningForm;
 import org.lamsfoundation.lams.tool.exception.DataMissingException;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
- * @author
- * @version
+ * @author Anthony Sukkar
  * 
  * @struts.action path="/learning" parameter="dispatch" scope="request"
  *                name="learningForm"
  * @struts.action-forward name="dimdim" path="tiles:/learning/main"
  * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  */
-public class LearningAction extends LamsDispatchAction {
+public class LearningAction extends DispatchAction {
 
-	private static Logger log = Logger.getLogger(LearningAction.class);
+	private static final Logger logger = Logger.getLogger(LearningAction.class);
 
-	private static final boolean MODE_OPTIONAL = false;
-
 	private IDimdimService dimdimService;
 
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+
+		// set up dimdimService
+		dimdimService = DimdimServiceProxy.getDimdimService(this.getServlet()
+				.getServletContext());
+
+		return super.execute(mapping, form, request, response);
+	}
+
 	public ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
 
 		LearningForm learningForm = (LearningForm) form;
 
-		// 'toolSessionID' and 'mode' paramters are expected to be present.
+		// 'toolSessionID' and 'mode' parameters are expected to be present.
 		// TODO need to catch exceptions and handle errors.
 		ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,
-				AttributeNames.PARAM_MODE, MODE_OPTIONAL);
+				AttributeNames.PARAM_MODE, false);
 
 		Long toolSessionID = WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_SESSION_ID);
 
-		// set up dimdimService
-		if (dimdimService == null) {
-			dimdimService = DimdimServiceProxy.getDimdimService(this
-					.getServlet().getServletContext());
-		}
-
 		// Retrieve the session and content.
 		DimdimSession dimdimSession = dimdimService
 				.getSessionBySessionId(toolSessionID);
 		if (dimdimSession == null) {
 			throw new DimdimException(
-					"Cannot retreive session with toolSessionID"
+					"Cannot retrieve session with toolSessionID"
 							+ toolSessionID);
 		}
 
@@ -109,7 +112,7 @@
 		}
 
 		// set mode, toolSessionID and DimdimDTO
-		request.setAttribute("mode", mode.toString());
+		request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 		learningForm.setToolSessionID(toolSessionID);
 
 		ContentDTO contentDTO = new ContentDTO();
@@ -118,11 +121,11 @@
 		contentDTO.allowRichEditor = dimdim.isAllowRichEditor();
 		contentDTO.lockOnFinish = dimdim.isLockOnFinished();
 
-		request.setAttribute("dimdimDTO", contentDTO);
+		request.setAttribute(Constants.ATTR_CONTENT_DTO, contentDTO);
 
 		// Set the content in use flag.
 		if (!dimdim.isContentInUse()) {
-			dimdim.setContentInUse(new Boolean(true));
+			dimdim.setContentInUse(true);
 			dimdimService.saveOrUpdateDimdim(dimdim);
 		}
 
@@ -158,7 +161,7 @@
 		} else {
 			request.setAttribute("contentEditable", true);
 		}
-		request.setAttribute("finishedActivity", dimdimUser
+		request.setAttribute(Constants.ATTR_FINISHED_ACTIVITY, dimdimUser
 				.isFinishedActivity());
 
 		return mapping.findForward("dimdim");
@@ -184,7 +187,8 @@
 	public ActionForward finishActivity(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
+		Long toolSessionID = WebUtil.readLongParam(request,
+				AttributeNames.PARAM_TOOL_SESSION_ID);
 
 		DimdimUser dimdimUser = getCurrentUser(toolSessionID);
 
@@ -197,7 +201,7 @@
 			if (dimdimUser.getEntryUID() == null) {
 				dimdimUser.setEntryUID(dimdimService.createNotebookEntry(
 						toolSessionID, CoreNotebookConstants.NOTEBOOK_TOOL,
-						DimdimConstants.TOOL_SIGNATURE, dimdimUser.getUserId()
+						Constants.TOOL_SIGNATURE, dimdimUser.getUserId()
 								.intValue(), learningForm.getEntryText()));
 			} else {
 				// update existing entry.
@@ -208,7 +212,7 @@
 			dimdimUser.setFinishedActivity(true);
 			dimdimService.saveOrUpdateDimdimUser(dimdimUser);
 		} else {
-			log.error("finishActivity(): couldn't find DimdimUser with id: "
+			logger.error("finishActivity(): couldn't find DimdimUser with id: "
 					+ dimdimUser.getUserId() + "and toolSessionID: "
 					+ toolSessionID);
 		}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -30,15 +30,16 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.actions.DispatchAction;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.DimdimUserDTO;
+import org.lamsfoundation.lams.tool.dimdim.dto.UserDTO;
 import org.lamsfoundation.lams.tool.dimdim.model.Dimdim;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
 import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy;
 import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService;
+import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
@@ -53,17 +54,28 @@
  *                        path="tiles:/monitoring/dimdim_display"
  * 
  */
-public class MonitoringAction extends LamsDispatchAction {
+public class MonitoringAction extends DispatchAction {
 
-	// private static Logger log = Logger.getLogger(MonitoringAction.class);
+	// private static final Logger logger =
+	// Logger.getLogger(MonitoringAction.class);
 
-	public IDimdimService dimdimService;
+	private IDimdimService dimdimService;
 
+	@Override
+	public ActionForward execute(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+
+		// set up dimdimService
+		dimdimService = DimdimServiceProxy.getDimdimService(this.getServlet()
+				.getServletContext());
+
+		return super.execute(mapping, form, request, response);
+	}
+
 	public ActionForward unspecified(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 
-		setupService();
-
 		Long toolContentID = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_CONTENT_ID));
 
@@ -82,35 +94,23 @@
 				AttributeNames.PARAM_CURRENT_TAB, true);
 		contentDT0.setCurrentTab(currentTab);
 
-		request.setAttribute("dimdimDTO", contentDT0);
-		request.setAttribute("contentFolderID", contentFolderID);
+		request.setAttribute(Constants.ATTR_CONTENT_DTO, contentDT0);
+		request.setAttribute(Constants.ATTR_CONTENT_FOLDER_ID, contentFolderID);
 		return mapping.findForward("success");
 	}
 
 	public ActionForward showDimdim(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
+		Long uid = new Long(WebUtil.readLongParam(request,
+				Constants.PARAM_USER_UID));
 
-		setupService();
-
-		Long uid = new Long(WebUtil.readLongParam(request, "userUID"));
-
 		DimdimUser user = dimdimService.getUserByUID(uid);
 		NotebookEntry entry = dimdimService.getEntry(user.getEntryUID());
 
-		DimdimUserDTO userDTO = new DimdimUserDTO(user, entry);
+		UserDTO userDTO = new UserDTO(user, entry);
 
-		request.setAttribute("userDTO", userDTO);
+		request.setAttribute(Constants.ATTR_USER_DTO, userDTO);
 
 		return mapping.findForward("dimdim_display");
 	}
-
-	/**
-	 * set up dimdimService
-	 */
-	private void setupService() {
-		if (dimdimService == null) {
-			dimdimService = DimdimServiceProxy.getDimdimService(this
-					.getServlet().getServletContext());
-		}
-	}
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/AdminForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -34,19 +34,19 @@
 
 /**
  * @struts.form name=adminForm"
- * @author asukkar
+ * @author Anthony Sukkar
  * 
  */
 public class AdminForm extends ActionForm {
 
 	private static final long serialVersionUID = 8367278543453322252L;
-	
-	// Properties
 
-	String dimdimServerHost;
+	// Fields
 
-	String dimdimServerPort;
+	private String dimdimServerHost;
 
+	private String dimdimServerPort;
+
 	@Override
 	public ActionErrors validate(ActionMapping mapping,
 			HttpServletRequest request) {
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/AuthoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -42,34 +42,42 @@
 
 	private static final long serialVersionUID = 3950453134542135495L;
 
-	// Properties
+	// Fields
 
-	String title;
+	private String title;
 
-	String instructions;
+	private String instructions;
 
-	String offlineInstruction;
+	private String offlineInstruction;
 
-	String onlineInstruction;
+	private String onlineInstruction;
 
-	boolean lockOnFinished;
+	private boolean lockOnFinished;
 
-	boolean allowRichEditor;
+	private boolean allowRichEditor;
 
-	FormFile onlineFile;
+	private FormFile onlineFile;
 
-	FormFile offlineFile;
+	private FormFile offlineFile;
 
-	String currentTab;
+	private String currentTab;
 
-	String dispatch;
+	private String dispatch;
 
-	String sessionMapID;
+	private String sessionMapID;
 
-	Long deleteFileUuid;
+	private Long deleteFileUuid;
 
-	SessionMap<String, Object> sessionMap;
+	private SessionMap<String, Object> sessionMap;
+	
+	private Integer maxParticipants;
 
+	private Integer meetingDurationInHours;
+
+	private boolean allowVideo;
+
+	private Integer attendeeMikes;
+	
 	@Override
 	public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
 		ActionErrors ac = new ActionErrors();
@@ -182,4 +190,36 @@
 	public void setAllowRichEditor(boolean allowRichEditor) {
 		this.allowRichEditor = allowRichEditor;
 	}
+
+	public Integer getMaxParticipants() {
+		return maxParticipants;
+	}
+
+	public void setMaxParticipants(Integer maxParticipants) {
+		this.maxParticipants = maxParticipants;
+	}
+
+	public Integer getMeetingDurationInHours() {
+		return meetingDurationInHours;
+	}
+
+	public void setMeetingDurationInHours(Integer meetingDurationInHours) {
+		this.meetingDurationInHours = meetingDurationInHours;
+	}
+
+	public boolean isAllowVideo() {
+		return allowVideo;
+	}
+
+	public void setAllowVideo(boolean allowVideo) {
+		this.allowVideo = allowVideo;
+	}
+
+	public Integer getAttendeeMikes() {
+		return attendeeMikes;
+	}
+
+	public void setAttendeeMikes(Integer attendeeMikes) {
+		this.attendeeMikes = attendeeMikes;
+	}
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/LearningForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -37,15 +37,20 @@
 
 	private static final long serialVersionUID = -4728946254882237144L;
 
-	String title;
-	String instructions;
+	// Fields
+	
+	private String title;
 
-	String dispatch;
-	Long toolSessionID;
-	String mode;
+	private String instructions;
 
-	String entryText;
+	private String dispatch;
 
+	private Long toolSessionID;
+
+	private String mode;
+
+	private String entryText;
+
 	public String getMode() {
 		return mode;
 	}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/MonitoringForm.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -34,15 +34,21 @@
 
 	private static final long serialVersionUID = 9096908688391850595L;
 
-	String dispatch;
-	boolean teacherVisible;
-	Long toolSessionID;
+	// Fields
+	
+	private String dispatch;
 
+	private boolean teacherVisible;
+
+	private Long toolSessionID;
+
 	// editing message page.
-	Long messageUID;
-	String messageBody;
-	boolean messageHidden;
+	private Long messageUID;
 
+	private String messageBody;
+
+	private boolean messageHidden;
+
 	public String getMessageBody() {
 		return messageBody;
 	}
@@ -90,5 +96,4 @@
 	public void setMessageHidden(boolean messageHidden) {
 		this.messageHidden = messageHidden;
 	}
-
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/Attic/ExportServlet.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java	20 Aug 2008 05:55:52 -0000	1.2
@@ -34,16 +34,16 @@
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.SessionDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.DimdimUserDTO;
 import org.lamsfoundation.lams.tool.dimdim.dto.NotebookEntryDTO;
+import org.lamsfoundation.lams.tool.dimdim.dto.SessionDTO;
+import org.lamsfoundation.lams.tool.dimdim.dto.UserDTO;
 import org.lamsfoundation.lams.tool.dimdim.model.Dimdim;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimSession;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
 import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy;
 import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService;
+import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.tool.dimdim.util.DimdimException;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -52,7 +52,7 @@
 
 	private static final long serialVersionUID = -2829707715037631881L;
 
-	private static Logger logger = Logger.getLogger(ExportServlet.class);
+	private static final Logger logger = Logger.getLogger(ExportServlet.class);
 
 	private final String FILENAME = "dimdim_main.html";
 
@@ -61,10 +61,7 @@
 	protected String doExport(HttpServletRequest request,
 			HttpServletResponse response, String directoryName, Cookie[] cookies) {
 
-		if (dimdimService == null) {
-			dimdimService = DimdimServiceProxy
-					.getDimdimService(getServletContext());
-		}
+		setupService();
 
 		try {
 			if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
@@ -95,10 +92,7 @@
 			logger
 					.error("Tool content Id or and session Id are null. Unable to activity title");
 		} else {
-			if (dimdimService == null) {
-				dimdimService = DimdimServiceProxy
-						.getDimdimService(getServletContext());
-			}
+			setupService();
 
 			Dimdim content = null;
 			if (toolContentID != null) {
@@ -134,8 +128,9 @@
 
 		Dimdim dimdim = dimdimSession.getDimdim();
 
-		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession()
-				.getAttribute(AttributeNames.USER);
+		// Get LAMS userDTO
+		org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager
+				.getSession().getAttribute(AttributeNames.USER);
 
 		DimdimUser dimdimUser = dimdimService.getUserByUserIdAndSessionId(
 				new Long(lamsUserDTO.getUserID()), toolSessionID);
@@ -153,13 +148,14 @@
 		sessionDTO.setSessionID(dimdimSession.getSessionId());
 
 		// If the user hasn't put in their entry yet, dimdimEntry will be null;
-		DimdimUserDTO userDTO = dimdimEntry != null ? new DimdimUserDTO(
-				dimdimUser, dimdimEntry) : new DimdimUserDTO(dimdimUser);
+		UserDTO userDTO = dimdimEntry != null ? new UserDTO(dimdimUser,
+				dimdimEntry) : new UserDTO(dimdimUser);
 
 		sessionDTO.getUserDTOs().add(userDTO);
 		contentDTO.getSessionDTOs().add(sessionDTO);
 
-		request.getSession().setAttribute("dimdimDTO", contentDTO);
+		request.getSession().setAttribute(Constants.ATTR_CONTENT_DTO,
+				contentDTO);
 	}
 
 	private void doTeacherExport(HttpServletRequest request,
@@ -181,8 +177,8 @@
 
 		// add the dimdimEntry for each user in each session
 
-		for (SessionDTO session : contentDTO.getSessionDTOs()) {
-			for (DimdimUserDTO user : session.getUserDTOs()) {
+		for (SessionDTO sessionDTO : contentDTO.getSessionDTOs()) {
+			for (UserDTO user : sessionDTO.getUserDTOs()) {
 				NotebookEntry entry = dimdimService
 						.getEntry(user.getEntryUID());
 				if (entry != null) {
@@ -192,7 +188,14 @@
 			}
 		}
 
-		request.getSession().setAttribute("dimdimDTO", contentDTO);
+		request.getSession().setAttribute(Constants.ATTR_CONTENT_DTO,
+				contentDTO);
 	}
 
+	private void setupService() {
+		if (dimdimService == null) {
+			dimdimService = DimdimServiceProxy
+					.getDimdimService(getServletContext());
+		}
+	}
 }
Index: lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml	20 Aug 2008 05:55:52 -0000	1.2
@@ -67,7 +67,7 @@
 
 	<!-- Begin: Learning -->
 	<definition name="tiles:/learning/main" extends="tiles:/layout:simple">
-		<put name="body" value="/pages/learning/dimdim.jsp" />
+		<put name="body" value="/pages/learning/learning.jsp" />
 	</definition>
 	
 	<definition name="tiles:/learning/runOffline" extends="tiles:/layout:simple">
Index: lams_tool_dimdim/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/authoring/Attic/authoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/authoring/authoring.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/authoring/authoring.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,7 +1,7 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <%@ page
-	import="org.lamsfoundation.lams.tool.dimdim.util.DimdimConstants"%>
+	import="org.lamsfoundation.lams.tool.dimdim.util.Constants"%>
 
 <html:form action="/authoring" styleId="authoringForm" method="post"
 	enctype="multipart/form-data">
@@ -48,7 +48,7 @@
 			</logic:messagesPresent>			
 		</div>
 
-		<lams:help toolSignature="<%=DimdimConstants.TOOL_SIGNATURE%>"
+		<lams:help toolSignature="<%=Constants.TOOL_SIGNATURE%>"
 			module="authoring" />
 
 		<%-- Page tabs --%>
Index: lams_tool_dimdim/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/authoring/Attic/basic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/authoring/basic.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/authoring/basic.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,7 +1,8 @@
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="formBean"
-	value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+	value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" />
 <c:set var="sessionMapID" value="${formBean.sessionMapID}" />
 
@@ -20,9 +21,73 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.instructions"></fmt:message>
 			</div>
-			<lams:FCKEditor id="instructions"
-				value="${formBean.instructions}"
+			<lams:FCKEditor id="instructions" value="${formBean.instructions}"
 				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 		</td>
 	</tr>
+
+	<tr>
+		<td>
+			<div class="field-name">
+				<fmt:message key="label.authoring.basic.dimdimSettings" />
+			</div>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.basic.maxParticipants" />
+			:
+			<html:select property="maxParticipants">
+				<html:option value="20"></html:option>
+				<html:option value="40"></html:option>
+				<html:option value="60"></html:option>
+				<html:option value="80"></html:option>
+				<html:option value="100"></html:option>
+				<html:option value="200"></html:option>
+				<html:option value="300"></html:option>
+				<html:option value="400"></html:option>
+				<html:option value="500"></html:option>
+			</html:select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.basic.meetingDurationInHours" />
+			:
+			<html:select property="meetingDurationInHours">
+				<html:option value="1"></html:option>
+				<html:option value="2"></html:option>
+				<html:option value="3"></html:option>
+				<html:option value="4"></html:option>
+				<html:option value="5"></html:option>
+			</html:select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<html:checkbox property="allowVideo" value="1" styleClass="noBorder"
+				styleId="allowVideo"></html:checkbox>
+			<label for="allowVideo">
+				<fmt:message key="label.authoring.basic.allowVideo" />
+			</label>
+		</td>
+	</tr>
+
+	<tr>
+		<td>
+			<fmt:message key="label.authoring.basic.attendeeMikes" />
+			:
+			<html:select property="attendeeMikes">
+				<html:option value="1"></html:option>
+				<html:option value="2"></html:option>
+				<html:option value="3"></html:option>
+				<html:option value="4"></html:option>
+				<html:option value="5"></html:option>
+			</html:select>
+		</td>
+	</tr>
+
 </table>
Index: lams_tool_dimdim/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/export/Attic/exportPortfolio.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/export/exportPortfolio.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/export/exportPortfolio.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -5,88 +5,87 @@
 
 <html>
 	<lams:head>
-		<title><c:out value="${dimdimDTO.title}" escapeXml="false" />
+		<title><c:out value="${contentDTO.title}" escapeXml="false" />
 		</title>
 		<lams:css localLinkPath="../" />
 	</lams:head>
 
 	<body class="stripes">
 
-			<div id="content">
+		<div id="content">
 
 			<h1>
-				<c:out value="${dimdimDTO.title}" escapeXml="false" />
+				<c:out value="${contentDTO.title}" escapeXml="false" />
 			</h1>
 
-				<p>
-					<c:out value="${dimdimDTO.instructions}" escapeXml="false" />
-				</p>
+			<p>
+				<c:out value="${contentDTO.instructions}" escapeXml="false" />
+			</p>
 
-				<c:if test='${mode == "teacher"}'>
-					<div id="sessionContents">
-						<ul>
-							<c:forEach var="session" items="${dimdimDTO.sessionDTOs}">
-								<li>
-									<a href="#sid-${session.sessionID}">${session.sessionName}</a>
-								</li>
-							</c:forEach>
-						</ul>
-					</div>
-				</c:if>
+			<c:if test='${mode == "teacher"}'>
+				<div id="sessionContents">
+					<ul>
+						<c:forEach var="session" items="${contentDTO.sessionDTOs}">
+							<li>
+								<a href="#sid-${session.sessionID}">${session.sessionName}</a>
+							</li>
+						</c:forEach>
+					</ul>
+				</div>
+			</c:if>
 
-				<c:forEach var="session" items="${dimdimDTO.sessionDTOs}">
-					<div id="sid-${session.sessionID}">
-						<h2>
-							${session.sessionName}
-						</h2>
-						<p>
-							&nbsp;
-						</p>
-						<c:forEach var="user" items="${session.userDTOs}">
-							<table>
+			<c:forEach var="session" items="${contentDTO.sessionDTOs}">
+				<div id="sid-${session.sessionID}">
+					<h2>
+						${session.sessionName}
+					</h2>
+					<p>
+						&nbsp;
+					</p>
+					<c:forEach var="user" items="${session.userDTOs}">
+						<table>
+							<tr>
+								<th colspan="2">
+									${user.firstName} ${user.lastName }
+								</th>
+							</tr>
+							<c:if test="${not empty user.entryDTO}">
 								<tr>
-									<th colspan="2">
-										${user.firstName} ${user.lastName }
-									</th>
+									<td class="field-name" width="20%">
+										<fmt:message key="label.created" />
+									</td>
+									<td>
+										<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
+									</td>
 								</tr>
-								<c:if test="${not empty user.entryDTO}">
-									<tr>
-										<td class="field-name" width="20%">
-											<fmt:message key="label.created" />
-										</td>
-										<td>
-											<lams:Date value="${user.entryDTO.createDate }"></lams:Date>
-										</td>
-									</tr>
-									<tr>
-										<td class="field-name" width="20%">
-											<fmt:message key="label.lastModified" />
-										</td>
-										<td>
-											<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
-										</td>
-									</tr>
-	
-									<tr>
-										<td class="field-name">
-											<fmt:message key="label.notebookEntry" />
-										</td>
-										<td>
-											<c:out value="${user.entryDTO.entry}" escapeXml="false"></c:out>
-										</td>
-									</tr>
-								</c:if>
-							</table>
-						</c:forEach>
-					</div>
-				</c:forEach>
-			</div>
-			<!--closes content-->
+								<tr>
+									<td class="field-name" width="20%">
+										<fmt:message key="label.lastModified" />
+									</td>
+									<td>
+										<lams:Date value="${user.entryDTO.lastModified }"></lams:Date>
+									</td>
+								</tr>
 
-			<div id="footer">
-			</div>
-			<!--closes footer-->
+								<tr>
+									<td class="field-name">
+										<fmt:message key="label.notebookEntry" />
+									</td>
+									<td>
+										<c:out value="${user.entryDTO.entry}" escapeXml="false"></c:out>
+									</td>
+								</tr>
+							</c:if>
+						</table>
+					</c:forEach>
+				</div>
+			</c:forEach>
+		</div>
+		<!--closes content-->
 
+		<div id="footer">
+		</div>
+		<!--closes footer-->
+
 	</body>
 </html>
-
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_dimdim/web/pages/learning/dimdim.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_dimdim/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/learning/Attic/learning.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/web/pages/learning/learning.jsp	20 Aug 2008 05:55:52 -0000	1.1
@@ -0,0 +1,93 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script type="text/javascript">
+<!--
+	var mode = "${mode}";
+
+	function disableFinishButton() {
+		document.getElementById("finishButton").disabled = true;
+	}
+
+	function validateForm() {
+	
+		// Validates that there's input from the user. 
+		
+		// disables the Finish button to avoid double submittion 
+		disableFinishButton();
+
+ 		if (mode == "learner") {
+			// if this is learner mode, then we add this validation see (LDEV-1319)
+		
+			if (document.learningForm.entryText.value == "") {
+				
+				// if the input is blank, then we further inquire to make sure it is correct
+				if (confirm("<fmt:message>message.learner.blank.input</fmt:message>"))  {
+					// if correct, submit form
+					return true;
+				} else {
+					// otherwise, focus on the text area
+					document.learningForm.entryText.focus();
+					document.getElementById("finishButton").disabled = false;
+					return false;      
+				}
+			} else {
+				// there was something on the form, so submit the form
+				return true;
+			}
+		}
+	}
+
+-->
+</script>
+
+<div id="content">
+	<h1>
+		${contentDTO.title}
+	</h1>
+
+	<p>
+		${contentDTO.instructions}
+	</p>
+
+	<c:if test="${contentDTO.lockOnFinish and mode == 'learner'}">
+		<div class="info">
+			<c:choose>
+				<c:when test="${finishedActivity}">
+					<fmt:message key="message.activityLocked" />
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.warnLockOnFinish" />
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</c:if>
+
+	&nbsp;
+
+	<html:form action="/learning" method="post"
+		onsubmit="return validateForm();">
+		<html:hidden property="dispatch" value="finishActivity" />
+		<html:hidden property="toolSessionID" />
+
+		<c:set var="lrnForm"
+			value="<%=request
+									.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
+
+		<c:choose>
+			<c:when test="${contentEditable}">
+
+				<div class="space-bottom-top align-right">
+					<html:submit styleClass="button" styleId="finishButton">
+						<fmt:message key="button.finish" />
+					</html:submit>
+				</div>
+
+			</c:when>
+
+			<c:otherwise>
+				<lams:out value="${lrnForm.entryText}" />
+			</c:otherwise>
+		</c:choose>
+
+	</html:form>
+</div>
Index: lams_tool_dimdim/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/learning/runOffline.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/learning/runOffline.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -8,15 +8,16 @@
 
 <div id="content">
 	<h1>
-		${dimdimDTO.title}
+		${contentDTO.title}
 	</h1>
 
 	<p>
 		<fmt:message key="message.runOfflineSet" />
 	</p>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
-		<html:form action="/learning" method="post" onsubmit="disableFinishButton();">
+		<html:form action="/learning" method="post"
+			onsubmit="disableFinishButton();">
 			<html:hidden property="dispatch" value="finishActivity" />
 			<html:hidden property="toolSessionID" />
 
Index: lams_tool_dimdim/web/pages/monitoring/editActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/editActivity.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/monitoring/editActivity.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/monitoring/editActivity.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${dimdimDTO}" />
+<c:set var="dto" value="${contentDTO}" />
 
 <c:if test="${dto.contentInUse}">
 	<p class="warning">
Index: lams_tool_dimdim/web/pages/monitoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/instructions.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/monitoring/instructions.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/monitoring/instructions.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,95 +1,105 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="dto" value="${dimdimDTO}" />
+<c:set var="dto" value="${contentDTO}" />
 
 <table cellspacing="0">
-	
+
 	<tr>
 		<td colspan="3">
 			<div class="field-name">
 				<fmt:message key="instructions.onlineInstructions" />
-			</div>	
+			</div>
 			<div style="padding-left: 20px;">
 				<c:out value="${dto.onlineInstructions}" escapeXml="false" />
 			</div>
 		</td>
 	</tr>
-	
+
 	<c:if test="${not empty dto.onlineInstructionsFiles}">
 		<tr>
-			<td  colspan="3" class="field-name-alternative-color">
+			<td colspan="3" class="field-name-alternative-color">
 				<fmt:message key="label.attachments" />
 			</td>
-		</tr>		
+		</tr>
 	</c:if>
-		
+
 	<c:forEach var="file" items="${dto.onlineInstructionsFiles}">
-		<tr >
-			<td width="7%" style="padding-left: 30px;">			
+		<tr>
+			<td width="7%" style="padding-left: 30px;">
 				<c:out value="${file.fileName}" />
 			</td>
-			
+
 			<td width="3%" align="left">
 				<c:set var="viewURL">
-					<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+					<html:rewrite
+						page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 				</c:set>
-				<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')" class="button"> <fmt:message key="link.view" /> </a> &nbsp;
+				<a
+					href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"
+					class="button"> <fmt:message key="link.view" /> </a> &nbsp;
 			</td>
-			
+
 			<td width="5%" align="left">
 				<c:set var="downloadURL">
-					<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+					<html:rewrite
+						page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 				</c:set>
-				<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="link.download" /> </a>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>"
+					class="button"> <fmt:message key="link.download" /> </a>
 			</td>
 		</tr>
 	</c:forEach>
 
-	
+
 	<tr>
 		<td colspan="3">
 			<hr />
 		</td>
 	</tr>
-	
+
 	<tr>
 		<td colspan="3">
 			<div class="field-name">
 				<fmt:message key="instructions.offlineInstructions" />
-			</div>	
+			</div>
 			<div style="padding-left: 20px;">
 				<c:out value="${dto.offlineInstructions}" escapeXml="false" />
 			</div>
 		</td>
 	</tr>
-	
+
 	<c:if test="${not empty dto.offlineInstructionsFiles}">
 		<tr>
-			<td  colspan="3" class="field-name-alternative-color">
+			<td colspan="3" class="field-name-alternative-color">
 				<fmt:message key="label.attachments" />
 			</td>
 		</tr>
-	</c:if>		
-		
+	</c:if>
+
 	<c:forEach var="file" items="${dto.offlineInstructionsFiles}">
-		<tr >
-			<td width="7%" style="padding-left: 30px;">			
+		<tr>
+			<td width="7%" style="padding-left: 30px;">
 				<c:out value="${file.fileName}" />
 			</td>
-			
+
 			<td width="3%" align="left">
 				<c:set var="viewURL">
-					<html:rewrite page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
+					<html:rewrite
+						page="/download/?uuid=${file.fileUuid}&preferDownload=false" />
 				</c:set>
-				<a href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')" class="button"> <fmt:message key="link.view" /> </a> &nbsp;
+				<a
+					href="javascript:launchInstructionsPopup('<c:out value='${viewURL}' escapeXml='false'/>')"
+					class="button"> <fmt:message key="link.view" /> </a> &nbsp;
 			</td>
-			
+
 			<td width="5%" align="left">
 				<c:set var="downloadURL">
-					<html:rewrite page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
+					<html:rewrite
+						page="/download/?uuid=${file.fileUuid}&versionID=${file.fileVersionId}&preferDownload=true" />
 				</c:set>
-				<a href="<c:out value='${downloadURL}' escapeXml='false'/>" class="button"> <fmt:message key="link.download" /> </a>
+				<a href="<c:out value='${downloadURL}' escapeXml='false'/>"
+					class="button"> <fmt:message key="link.download" /> </a>
 			</td>
 		</tr>
 	</c:forEach>
-	
+
 </table>
Index: lams_tool_dimdim/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/monitoring.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/monitoring/monitoring.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/monitoring/monitoring.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,5 +1,5 @@
 <%@ include file="/common/taglibs.jsp"%>
-<%@ page import="org.lamsfoundation.lams.tool.dimdim.util.DimdimConstants"%>
+<%@ page import="org.lamsfoundation.lams.tool.dimdim.util.Constants"%>
 
 <div id="header">
 	<lams:Tabs>
@@ -9,16 +9,19 @@
 		<lams:Tab id="4" key="button.statistics" />
 	</lams:Tabs>
 	<script type="text/javascript">
-		var initialTabId = "${dimdimDTO.currentTab}";
+		var initialTabId = "${contentDTO.currentTab}";
 	</script>
 </div>
 
 <div id="content">
-	<lams:help toolSignature="<%= DimdimConstants.TOOL_SIGNATURE %>" module="monitoring"/>
+	<lams:help toolSignature="<%=Constants.TOOL_SIGNATURE%>"
+		module="monitoring" />
 
 	<lams:TabBody id="1" titleKey="button.summary" page="summary.jsp" />
-	<lams:TabBody id="2" titleKey="button.instructions" page="instructions.jsp" />
-	<lams:TabBody id="3" titleKey="button.editActivity" page="editActivity.jsp" />
+	<lams:TabBody id="2" titleKey="button.instructions"
+		page="instructions.jsp" />
+	<lams:TabBody id="3" titleKey="button.editActivity"
+		page="editActivity.jsp" />
 	<lams:TabBody id="4" titleKey="button.statistics" page="statistics.jsp" />
 </div>
 
Index: lams_tool_dimdim/web/pages/monitoring/statistics.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/statistics.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/monitoring/statistics.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/monitoring/statistics.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,6 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<c:set var="dto" value="${dimdimDTO}" />
+<c:set var="dto" value="${contentDTO}" />
 <c:forEach var="session" items="${dto.sessionDTOs}">
 
 	<table>
Index: lams_tool_dimdim/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/pages/monitoring/Attic/summary.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/web/pages/monitoring/summary.jsp	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/web/pages/monitoring/summary.jsp	20 Aug 2008 05:55:52 -0000	1.2
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript"
+	src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js"></script>
 <script type="text/javascript">
 <!--
 	var evalcomixWindow = null;
@@ -12,54 +13,55 @@
 //-->
 </script>
 
-<c:set var="dto" value="${dimdimDTO}" />
+<c:set var="dto" value="${contentDTO}" />
 
 <h1>
-	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
+	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon"
+		onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
 
-	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
-		<fmt:message key="monitor.summary.th.advancedSettings" />
-	</a>
+	<a
+		href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');">
+		<fmt:message key="monitor.summary.th.advancedSettings" /> </a>
 </h1>
 <br />
 
-<div class="monitoring-advanced" id="advancedDiv" style="display:none">
-<table class="alternative-color">
+<div class="monitoring-advanced" id="advancedDiv" style="display: none">
+	<table class="alternative-color">
 
-	<tr>
-		<td>
-			<fmt:message key="advanced.lockOnFinished" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.lockOnFinish}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-	
-	<tr>
-		<td>
-			<fmt:message key="advanced.allowRichEditor" />
-		</td>
-		
-		<td>
-			<c:choose>
-				<c:when test="${dto.allowRichEditor}">
-					<fmt:message key="label.on" />
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.off" />
-				</c:otherwise>
-			</c:choose>	
-		</td>
-	</tr>
-</table>
+		<tr>
+			<td>
+				<fmt:message key="advanced.lockOnFinished" />
+			</td>
+
+			<td>
+				<c:choose>
+					<c:when test="${dto.lockOnFinish}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+
+		<tr>
+			<td>
+				<fmt:message key="advanced.allowRichEditor" />
+			</td>
+
+			<td>
+				<c:choose>
+					<c:when test="${dto.allowRichEditor}">
+						<fmt:message key="label.on" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="label.off" />
+					</c:otherwise>
+				</c:choose>
+			</td>
+		</tr>
+	</table>
 </div>
 
 <c:forEach var="session" items="${dto.sessionDTOs}">