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.7 -r1.8
--- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	1 Oct 2008 02:59:36 -0000	1.7
+++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties	1 Oct 2008 03:53:24 -0000	1.8
@@ -91,7 +91,6 @@
 monitor.summary.th.advancedSettings  =Advanced Settings
 
 label.authoring.basic.dimdimSettings = Dimdim Settings
-label.authoring.basic.topic  = Topic
 label.authoring.basic.maxAttendeeMikes  = Attendee Mikes
 
 admin.title = Dim Dim Administration
Index: lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql,v
diff -u -r1.5 -r1.6
--- lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql	1 Oct 2008 02:59:36 -0000	1.5
+++ lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql	1 Oct 2008 03:53:24 -0000	1.6
@@ -10,9 +10,9 @@
 drop table if exists tl_laddim10_session;
 drop table if exists tl_laddim10_user;
 create table tl_laddim10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, dimdim_uid bigint, primary key (uid));
-create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_dimdim_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid));
-create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, notebook_entry_uid bigint, primary key (uid));
 -- end generated sql
 
Index: lams_tool_dimdim/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/db/sql/Attic/table-schema.sql,v
diff -u -r1.5 -r1.6
--- lams_tool_dimdim/db/sql/table-schema.sql	1 Oct 2008 02:59:36 -0000	1.5
+++ lams_tool_dimdim/db/sql/table-schema.sql	1 Oct 2008 03:53:24 -0000	1.6
@@ -7,9 +7,9 @@
 drop table if exists tl_laddim10_session;
 drop table if exists tl_laddim10_user;
 create table tl_laddim10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, dimdim_uid bigint, primary key (uid));
-create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_dimdim (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, reflect_on_activity bit, reflect_instructions text, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_dimdim_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid));
-create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, topic varchar(255), meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
+create table tl_laddim10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), dimdim_uid bigint, meeting_key varchar(255), max_attendee_mikes integer, primary key (uid));
 create table tl_laddim10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, dimdim_session_uid bigint, notebook_entry_uid bigint, primary key (uid));
 alter table tl_laddim10_attachment add index fk_laddim10_dimdim_attachment_to_dimdim (dimdim_uid), add constraint fk_laddim10_dimdim_attachment_to_dimdim foreign key (dimdim_uid) references tl_laddim10_dimdim (uid);
 alter table tl_laddim10_session add index fk_laddim10_dimdim_session_to_dimdim (dimdim_uid), add constraint fk_laddim10_dimdim_session_to_dimdim foreign key (dimdim_uid) references tl_laddim10_dimdim (uid);
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.7 -r1.8
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	1 Oct 2008 02:59:36 -0000	1.7
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java	1 Oct 2008 03:53:24 -0000	1.8
@@ -67,8 +67,6 @@
 
     public Long currentTab;
 
-    private String topic;
-
     private Integer maxAttendeeMikes;
 
     /* Constructors */
@@ -90,7 +88,6 @@
 	this.onlineInstructionsFiles = new TreeSet<AttachmentDTO>();
 	this.offlineInstructionsFiles = new TreeSet<AttachmentDTO>();
 
-	this.topic = dimdim.getTopic();
 	this.maxAttendeeMikes = dimdim.getMaxAttendeeMikes();
 
 	for (DimdimAttachment att : dimdim.getDimdimAttachments()) {
@@ -226,14 +223,6 @@
 	this.currentTab = currentTab;
     }
 
-    public String getTopic() {
-	return topic;
-    }
-
-    public void setTopic(String topic) {
-	this.topic = topic;
-    }
-
     public Integer getMaxAttendeeMikes() {
 	return maxAttendeeMikes;
     }
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.6 -r1.7
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	1 Oct 2008 02:59:36 -0000	1.6
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java	1 Oct 2008 03:53:24 -0000	1.7
@@ -83,8 +83,6 @@
 
     private Set<DimdimSession> dimdimSessions;
 
-    private String topic;
-
     private Integer maxAttendeeMikes;
 
     // Constructors
@@ -349,18 +347,6 @@
     }
 
     /**
-     * @hibernate.property column="topic"
-     * @return
-     */
-    public String getTopic() {
-	return topic;
-    }
-
-    public void setTopic(String topic) {
-	this.topic = topic;
-    }
-
-    /**
      * @hibernate.property column="max_attendee_mikes"
      * @return
      */
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.6 -r1.7
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	30 Sep 2008 05:20:29 -0000	1.6
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	1 Oct 2008 03:53:24 -0000	1.7
@@ -61,8 +61,6 @@
 
     private Set<DimdimUser> dimdimUsers;
 
-    private String topic;
-
     private String meetingKey;
 
     private Integer maxAttendeeMikes;
@@ -194,18 +192,6 @@
     }
 
     /**
-     * @hibernate.property column="topic"
-     * @return
-     */
-    public String getTopic() {
-	return topic;
-    }
-
-    public void setTopic(String topic) {
-	this.topic = topic;
-    }
-
-    /**
      * @hibernate.property column="meeting_key"
      * @return
      */
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.8 -r1.9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	1 Oct 2008 02:59:36 -0000	1.8
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java	1 Oct 2008 03:53:24 -0000	1.9
@@ -480,7 +480,7 @@
 	return serverURL.getValue() + connectURL;
     }
 
-    public String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String topic) throws Exception {
+    public String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey) throws Exception {
 
 	// Get Dimdim server url
 	DimdimConfig serverURL = getConfigEntry(Constants.CONFIG_SERVER_URL);
@@ -493,11 +493,10 @@
 
 	URL url = new URL(serverURL.getValue() + "/dimdim/StartNewConferenceCheck.action?" + "email="
 		+ URLEncoder.encode(userDTO.getEmail(), "UTF8") + "&displayName="
-		+ URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confName="
-		+ URLEncoder.encode(topic, "UTF8") + "&confKey=" + URLEncoder.encode(meetingKey, "UTF8")
-		+ "&lobby=false" + "&networkProfile=3" + "&meetingHours=99" + "&maxAttendeeMikes=0" + "&returnUrl=asdf"
-		+ "&presenterAV=av" + "&privateChatEnabled=true" + "&publicChatEnabled=true"
-		+ "&screenShareEnabled=true" + "&whiteboardEnabled=true");
+		+ URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confKey="
+		+ URLEncoder.encode(meetingKey, "UTF8") + "&lobby=false" + "&networkProfile=3" + "&meetingHours=99"
+		+ "&maxAttendeeMikes=0" + "&returnUrl=asdf" + "&presenterAV=av" + "&privateChatEnabled=true"
+		+ "&publicChatEnabled=true" + "&screenShareEnabled=true" + "&whiteboardEnabled=true");
 
 	String connectURL = sendDimdimRequest(url);
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/Attic/IDimdimService.java,v
diff -u -r1.6 -r1.7
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	1 Oct 2008 02:59:36 -0000	1.6
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	1 Oct 2008 03:53:24 -0000	1.7
@@ -174,10 +174,10 @@
      * 
      * @param userDTO
      * @param meetingKey
-     * @param topic
      * @return
+     * @throws Exception
      */
-    String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String topic) throws Exception;
+    String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey) throws Exception;
 
     /**
      * 
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.6 -r1.7
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	1 Oct 2008 02:59:36 -0000	1.6
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java	1 Oct 2008 03:53:24 -0000	1.7
@@ -351,7 +351,6 @@
 	    dimdim.setAllowRichEditor(authForm.isAllowRichEditor());
 
 	    // TODO check whether these fields should be in here
-	    dimdim.setTopic(authForm.getTopic());
 	    dimdim.setMaxAttendeeMikes(authForm.getMaxAttendeeMikes());
 	}
     }
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.8 -r1.9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	1 Oct 2008 02:59:36 -0000	1.8
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java	1 Oct 2008 03:53:24 -0000	1.9
@@ -154,7 +154,7 @@
 	String connectURL = "";
 	if (mode.isAuthor()) {
 	    String meetingKey = DimdimUtil.generateMeetingKey();
-	    connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, meetingKey, dimdim.getTopic());
+	    connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, meetingKey);
 	} else {
 	    if (dimdimSession.getMeetingKey() != null) {
 		connectURL = dimdimService.getDimdimJoinConferenceURL(lamsUserDTO, dimdimSession.getMeetingKey());
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.8 -r1.9
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	1 Oct 2008 02:59:36 -0000	1.8
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java	1 Oct 2008 03:53:24 -0000	1.9
@@ -90,7 +90,6 @@
 
 	MonitoringForm monitoringForm = (MonitoringForm) form;
 	// populate using authoring values
-	monitoringForm.setTopic(contentDT0.getTopic());
 	monitoringForm.setMaxAttendeeMikes((contentDT0.getMaxAttendeeMikes()));
 
 	// TODO may need to populate using session values if they already exist
@@ -127,7 +126,6 @@
 	DimdimSession session = dimdimService.getSessionBySessionId(monitoringForm.getToolSessionID());
 
 	// update dimdim meeting settings
-	session.setTopic(monitoringForm.getTopic());
 	session.setMaxAttendeeMikes(monitoringForm.getMaxAttendeeMikes());
 
 	// Get LAMS userDTO
@@ -138,8 +136,7 @@
 	session.setMeetingKey(meetingKey);
 	dimdimService.saveOrUpdateDimdimSession(session);
 
-	String startConferenceURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, session.getMeetingKey(),
-		session.getTopic());
+	String startConferenceURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, session.getMeetingKey());
 
 	response.sendRedirect(startConferenceURL);
 
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.6 -r1.7
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	1 Oct 2008 02:59:36 -0000	1.6
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java	1 Oct 2008 03:53:24 -0000	1.7
@@ -73,8 +73,6 @@
 
     private SessionMap<String, Object> sessionMap;
 
-    private String topic;
-
     private Integer maxAttendeeMikes;
 
     @Override
@@ -205,14 +203,6 @@
 	this.allowRichEditor = allowRichEditor;
     }
 
-    public String getTopic() {
-	return topic;
-    }
-
-    public void setTopic(String topic) {
-	this.topic = topic;
-    }
-
     public Integer getMaxAttendeeMikes() {
 	return maxAttendeeMikes;
     }
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.5 -r1.6
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java	30 Sep 2008 05:20:29 -0000	1.5
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java	1 Oct 2008 03:53:24 -0000	1.6
@@ -39,8 +39,6 @@
 
     private Long toolSessionID;
 
-    private String topic;
-
     private Integer maxAttendeeMikes;
 
     public String getDispatch() {
@@ -59,14 +57,6 @@
 	this.toolSessionID = toolSessionID;
     }
 
-    public String getTopic() {
-	return topic;
-    }
-
-    public void setTopic(String topic) {
-	this.topic = topic;
-    }
-
     public Integer getMaxAttendeeMikes() {
 	return maxAttendeeMikes;
     }
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.5 -r1.6
--- lams_tool_dimdim/web/pages/authoring/basic.jsp	1 Oct 2008 02:59:36 -0000	1.5
+++ lams_tool_dimdim/web/pages/authoring/basic.jsp	1 Oct 2008 03:53:24 -0000	1.6
@@ -23,9 +23,6 @@
 			</div>
 			<lams:FCKEditor id="instructions" value="${formBean.instructions}"
 				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
-				
-							<lams:FCKEditor id="instructions" value="${formBean.instructions}"
-				contentFolderID="${sessionMap.contentFolderID}"></lams:FCKEditor>
 		</td>
 	</tr>
 
@@ -34,19 +31,7 @@
 			<div class="field-name">
 				<fmt:message key="label.authoring.basic.dimdimSettings" />
 			</div>
-		</td>
-	</tr>
 
-	<tr>
-		<td>
-			<fmt:message key="label.authoring.basic.topic" />
-			:
-			<html:text property="topic"></html:text>
-		</td>
-	</tr>
-
-	<tr>
-		<td>
 			<fmt:message key="label.authoring.basic.maxAttendeeMikes" />
 			:
 			<html:select property="maxAttendeeMikes">
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.7 -r1.8
--- lams_tool_dimdim/web/pages/monitoring/summary.jsp	1 Oct 2008 02:59:36 -0000	1.7
+++ lams_tool_dimdim/web/pages/monitoring/summary.jsp	1 Oct 2008 03:53:24 -0000	1.8
@@ -83,14 +83,6 @@
 				
 				<table>
 					<tr>
-						<td>				
-							<fmt:message key="label.authoring.basic.topic" />
-							:
-							<html:text property="topic"></html:text>
-						</td>
-					</tr>
-					</tr>
-					<tr>
 						<td>
 							<fmt:message key="label.authoring.basic.maxAttendeeMikes" />
 							: