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.5 -r1.6 --- lams_tool_dimdim/conf/language/lams/ApplicationResources.properties 16 Sep 2008 01:55:38 -0000 1.5 +++ lams_tool_dimdim/conf/language/lams/ApplicationResources.properties 19 Sep 2008 06:16:16 -0000 1.6 @@ -91,7 +91,6 @@ label.authoring.basic.dimdimSettings = Dimdim Settings label.authoring.basic.topic = Topic -label.authoring.basic.meetingKey = Meeting Key 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.3 -r1.4 --- lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql 15 Sep 2008 11:06:40 -0000 1.3 +++ lams_tool_dimdim/db/sql/create_lams_tool_dimdim.sql 19 Sep 2008 06:16:16 -0000 1.4 @@ -3,20 +3,32 @@ -- TODO check InnoDB is set SET FOREIGN_KEY_CHECKS=0; +-- generated sql drop table if exists tl_laddim10_attachment; drop table if exists tl_laddim10_dimdim; drop table if exists tl_laddim10_dimdim_config; 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, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), meeting_key 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, 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_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, conf_key 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_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, entry_uid bigint, primary key (uid)); -alter table tl_laddim10_attachment add index FK3525B03D7B14D4B (dimdim_uid), add constraint FK3525B03D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); -alter table tl_laddim10_session add index FKC847CCB6D7B14D4B (dimdim_uid), add constraint FKC847CCB6D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); -alter table tl_laddim10_user add index FK91F0D5AB77EFDAE4 (dimdim_session_uid), add constraint FK91F0D5AB77EFDAE4 foreign key (dimdim_session_uid) references tl_laddim10_session (uid); +-- end generated sql +-- set engine to innodb for all tables +alter table tl_laddim10_attachment engine=innodb; +alter table tl_laddim10_dimdim engine=innodb; +alter table tl_laddim10_dimdim_config engine=innodb; +alter table tl_laddim10_session engine=innodb; +alter table tl_laddim10_user engine=innodb; + +-- generated sql +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); +alter table tl_laddim10_user add index fk_laddim10_dimdim_user_to_dimdim_session (dimdim_session_uid), add constraint fk_laddim10_dimdim_user_to_dimdim_session foreign key (dimdim_session_uid) references tl_laddim10_session (uid); +-- end generated sql + INSERT INTO tl_laddim10_dimdim ( title, instructions, 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.3 -r1.4 --- lams_tool_dimdim/db/sql/table-schema.sql 15 Sep 2008 11:06:40 -0000 1.3 +++ lams_tool_dimdim/db/sql/table-schema.sql 19 Sep 2008 06:16:16 -0000 1.4 @@ -1,16 +1,16 @@ -alter table tl_laddim10_attachment drop foreign key FK3525B03D7B14D4B; -alter table tl_laddim10_session drop foreign key FKC847CCB6D7B14D4B; -alter table tl_laddim10_user drop foreign key FK91F0D5AB77EFDAE4; +alter table tl_laddim10_attachment drop foreign key fk_laddim10_dimdim_attachment_to_dimdim; +alter table tl_laddim10_session drop foreign key fk_laddim10_dimdim_session_to_dimdim; +alter table tl_laddim10_user drop foreign key fk_laddim10_dimdim_user_to_dimdim_session; drop table if exists tl_laddim10_attachment; drop table if exists tl_laddim10_dimdim; drop table if exists tl_laddim10_dimdim_config; 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, allow_rich_editor bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, topic varchar(255), meeting_key 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, 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_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, conf_key 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_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, entry_uid bigint, primary key (uid)); -alter table tl_laddim10_attachment add index FK3525B03D7B14D4B (dimdim_uid), add constraint FK3525B03D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); -alter table tl_laddim10_session add index FKC847CCB6D7B14D4B (dimdim_uid), add constraint FKC847CCB6D7B14D4B foreign key (dimdim_uid) references tl_laddim10_dimdim (uid); -alter table tl_laddim10_user add index FK91F0D5AB77EFDAE4 (dimdim_session_uid), add constraint FK91F0D5AB77EFDAE4 foreign key (dimdim_session_uid) references tl_laddim10_session (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); +alter table tl_laddim10_user add index fk_laddim10_dimdim_user_to_dimdim_session (dimdim_session_uid), add constraint fk_laddim10_dimdim_user_to_dimdim_session foreign key (dimdim_session_uid) references tl_laddim10_session (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.4 -r1.5 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java 15 Sep 2008 11:06:40 -0000 1.4 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ContentDTO.java 19 Sep 2008 06:16:16 -0000 1.5 @@ -20,7 +20,6 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ - /* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.dto; @@ -63,10 +62,8 @@ public Set sessionDTOs = new TreeSet(); public Long currentTab; - + private String topic; - - private String meetingKey; private Integer maxAttendeeMikes; @@ -86,9 +83,8 @@ this.onlineInstructionsFiles = new TreeSet(); this.offlineInstructionsFiles = new TreeSet(); - + this.topic = dimdim.getTopic(); - this.meetingKey = dimdim.getMeetingKey(); this.maxAttendeeMikes = dimdim.getMaxAttendeeMikes(); for (DimdimAttachment att : dimdim.getDimdimAttachments()) { @@ -220,20 +216,11 @@ this.topic = topic; } - public String getMeetingKey() { - return meetingKey; - } - - public void setMeetingKey(String meetingKey) { - this.meetingKey = meetingKey; - } - public Integer getMaxAttendeeMikes() { return maxAttendeeMikes; } public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { this.maxAttendeeMikes = 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.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java 12 Sep 2008 08:05:49 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Dimdim.java 19 Sep 2008 06:16:16 -0000 1.4 @@ -20,7 +20,7 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ -/* $$Id$$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.model; @@ -80,8 +80,6 @@ private Set dimdimSessions; private String topic; - - private String meetingKey; private Integer maxAttendeeMikes; @@ -302,7 +300,8 @@ /** * @hibernate.set lazy="true" inverse="false" cascade="all-delete-orphan" * @hibernate.collection-key column="dimdim_uid" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.dimdim.model.DimdimAttachment" + * @hibernate.collection-one-to-many + * class="org.lamsfoundation.lams.tool.dimdim.model.DimdimAttachment" * */ @@ -317,7 +316,8 @@ /** * @hibernate.set lazy="true" inverse="true" cascade="none" * @hibernate.collection-key column="dimdim_uid" - * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.dimdim.model.DimdimSession" + * @hibernate.collection-one-to-many + * class="org.lamsfoundation.lams.tool.dimdim.model.DimdimSession" * */ public Set getDimdimSessions() { @@ -327,7 +327,7 @@ public void setDimdimSessions(Set dimdimSessions) { this.dimdimSessions = dimdimSessions; } - + /** * @hibernate.property column="topic" * @return @@ -341,18 +341,6 @@ } /** - * @hibernate.property column="meeting_key" - * @return - */ - public String getMeetingKey() { - return meetingKey; - } - - public void setMeetingKey(String meetingKey) { - this.meetingKey = meetingKey; - } - - /** * @hibernate.property column="max_attendee_mikes" * @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.5 -r1.6 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java 16 Sep 2008 14:18:47 -0000 1.5 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java 19 Sep 2008 06:16:16 -0000 1.6 @@ -20,16 +20,14 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ -/* $$Id$$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.service; import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; @@ -162,6 +160,7 @@ return null; } + @SuppressWarnings("unchecked") public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException { // TODO Auto-generated method stub @@ -436,6 +435,7 @@ } else { return list.get(0); } + } public DimdimAttachment uploadFileToContent(Long toolContentId, @@ -462,7 +462,7 @@ + " the repository " + e.getMessage()); } } - + /** * * @param url @@ -488,18 +488,19 @@ matcher.find(); String connectURL = matcher.group(1); - + return connectURL; } - - public String getDimdimJoinConferenceURL(UserDTO userDTO, String meetingKey) throws Exception { - + + public String getDimdimJoinConferenceURL(UserDTO userDTO, String meetingKey) + throws Exception { + // Get Dimdim server url DimdimConfig serverURL = getConfigEntry(Constants.CONFIG_SERVER_URL); if (serverURL == null) { throw new DimdimException("Dimdim server url not found"); } - + URL url = new URL(serverURL.getValue() + "/dimdim/JoinConferenceCheck.action?" + "email=" @@ -508,7 +509,7 @@ + URLEncoder.encode(userDTO.getFirstName() + " " + userDTO.getLastName(), "UTF8") + "&confKey=" + URLEncoder.encode(meetingKey, "UTF8")); - + String connectURL = sendDimdimRequest(url); return serverURL.getValue() + connectURL; @@ -563,10 +564,11 @@ return dimdimUser; } + @SuppressWarnings("unchecked") public DimdimConfig getConfigEntry(String key) { dimdimConfigDAO.findByProperty(DimdimConfig.class, "key", key); - List list = dimdimConfigDAO.findByProperty( - DimdimConfig.class, "key", key); + List list = (List) dimdimConfigDAO + .findByProperty(DimdimConfig.class, "key", key); if (list.isEmpty()) { return null; } else { @@ -653,6 +655,7 @@ /** * Import the data for a 1.0.2 Dimdim */ + @SuppressWarnings("unchecked") public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { Date now = new Date(); 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.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java 12 Sep 2008 08:05:49 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java 19 Sep 2008 06:16:16 -0000 1.4 @@ -20,7 +20,7 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ -/* $$Id$$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.web.actions; @@ -38,7 +38,6 @@ 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; @@ -71,8 +70,8 @@ */ public class AuthoringAction extends DispatchAction { - private static final Logger logger = Logger - .getLogger(AuthoringAction.class); + // private static final Logger logger = + // Logger.getLogger(AuthoringAction.class); private IDimdimService dimdimService; @@ -235,7 +234,7 @@ IToolContentHandler.TYPE_OFFLINE, request); } - /* ========== Private Methods ********** */ + /* ========== Private Methods */ private ActionForward uploadFile(ActionMapping mapping, AuthoringForm authForm, String type, HttpServletRequest request) { @@ -374,7 +373,6 @@ // TODO check whether these fields should be in here dimdim.setTopic(authForm.getTopic()); - dimdim.setMeetingKey(authForm.getMeetingKey()); dimdim.setMaxAttendeeMikes(authForm.getMaxAttendeeMikes()); } } @@ -448,10 +446,11 @@ ToolAccessMode mode; String modeStr = request.getParameter(AttributeNames.ATTR_MODE); if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER - .toString())) + .toString())) { mode = ToolAccessMode.TEACHER; - else + } else { mode = ToolAccessMode.AUTHOR; + } return mode; } 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.5 -r1.6 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java 16 Sep 2008 14:18:47 -0000 1.5 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java 19 Sep 2008 06:16:16 -0000 1.6 @@ -20,18 +20,11 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ -/* $$Id$$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.web.actions; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,13 +40,13 @@ import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO; import org.lamsfoundation.lams.tool.dimdim.model.Dimdim; -import org.lamsfoundation.lams.tool.dimdim.model.DimdimConfig; 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.tool.dimdim.util.DimdimUtil; import org.lamsfoundation.lams.tool.dimdim.web.forms.LearningForm; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -175,14 +168,17 @@ // Get LAMS userDTO org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager .getSession().getAttribute(AttributeNames.USER); - + String connectURL = ""; if (mode.isAuthor()) { - connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, dimdim.getMeetingKey(), dimdim.getTopic()); + String meetingKey = DimdimUtil.generateMeetingKey(); + connectURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, + meetingKey, dimdim.getTopic()); } else { - connectURL = dimdimService.getDimdimJoinConferenceURL(lamsUserDTO, dimdimSession.getMeetingKey()); + connectURL = dimdimService.getDimdimJoinConferenceURL(lamsUserDTO, + dimdimSession.getMeetingKey()); } - + boolean conferenceOpen = connectURL.isEmpty() ? false : true; request.setAttribute(Constants.ATTR_CONFERENCE_OPEN, conferenceOpen); @@ -238,9 +234,9 @@ dimdimUser.setFinishedActivity(true); dimdimService.saveOrUpdateDimdimUser(dimdimUser); } else { - logger.error("finishActivity(): couldn't find DimdimUser with id: " - + dimdimUser.getUserId() + "and toolSessionID: " - + toolSessionID); + logger + .error("finishActivity(): couldn't find/create DimdimUser in toolSessionID: " + + toolSessionID); } ToolSessionManager sessionMgrService = DimdimServiceProxy 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.5 -r1.6 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java 16 Sep 2008 14:18:47 -0000 1.5 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java 19 Sep 2008 06:16:16 -0000 1.6 @@ -20,21 +20,10 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ -/* $$Id$$ */ +/* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.web.actions; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLEncoder; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -46,13 +35,12 @@ import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO; import org.lamsfoundation.lams.tool.dimdim.dto.UserDTO; import org.lamsfoundation.lams.tool.dimdim.model.Dimdim; -import org.lamsfoundation.lams.tool.dimdim.model.DimdimConfig; 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.tool.dimdim.util.DimdimUtil; import org.lamsfoundation.lams.tool.dimdim.web.forms.MonitoringForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -108,7 +96,6 @@ MonitoringForm monitoringForm = (MonitoringForm) form; // populate using authoring values monitoringForm.setTopic(contentDT0.getTopic()); - monitoringForm.setMeetingKey((contentDT0.getMeetingKey())); monitoringForm.setMaxAttendeeMikes((contentDT0.getMaxAttendeeMikes())); // TODO may need to populate using session values if they already exist @@ -138,7 +125,8 @@ } public ActionForward startDimdim(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response) throws Exception { + HttpServletRequest request, HttpServletResponse response) + throws Exception { MonitoringForm monitoringForm = (MonitoringForm) form; @@ -148,17 +136,21 @@ // update dimdim meeting settings session.setTopic(monitoringForm.getTopic()); - session.setMeetingKey(monitoringForm.getMeetingKey()); session.setMaxAttendeeMikes(monitoringForm.getMaxAttendeeMikes()); // Get LAMS userDTO org.lamsfoundation.lams.usermanagement.dto.UserDTO lamsUserDTO = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) SessionManager .getSession().getAttribute(AttributeNames.USER); - String startConferenceURL = dimdimService.getDimdimStartConferenceURL(lamsUserDTO, session.getMeetingKey(), session.getTopic()); - + String meetingKey = DimdimUtil.generateMeetingKey(); + session.setMeetingKey(meetingKey); + dimdimService.saveOrUpdateDimdimSession(session); + + String startConferenceURL = dimdimService.getDimdimStartConferenceURL( + lamsUserDTO, session.getMeetingKey(), session.getTopic()); + response.sendRedirect(startConferenceURL); - + return null; } 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.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java 12 Sep 2008 08:05:49 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AuthoringForm.java 19 Sep 2008 06:16:16 -0000 1.4 @@ -20,7 +20,6 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ - /* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.web.forms; @@ -69,13 +68,11 @@ private Long deleteFileUuid; private SessionMap sessionMap; - + private String topic; - - private String meetingKey; private Integer maxAttendeeMikes; - + @Override public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) { ActionErrors ac = new ActionErrors(); @@ -197,14 +194,6 @@ this.topic = topic; } - public String getMeetingKey() { - return meetingKey; - } - - public void setMeetingKey(String meetingKey) { - this.meetingKey = meetingKey; - } - 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.3 -r1.4 --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java 12 Sep 2008 08:05:49 -0000 1.3 +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/MonitoringForm.java 19 Sep 2008 06:16:16 -0000 1.4 @@ -20,7 +20,6 @@ * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ - /* $Id$ */ package org.lamsfoundation.lams.tool.dimdim.web.forms; @@ -42,47 +41,37 @@ private String topic; - private String meetingKey; - private Integer maxAttendeeMikes; public String getDispatch() { return dispatch; } - public Integer getMaxAttendeeMikes() { - return maxAttendeeMikes; + public void setDispatch(String dispatch) { + this.dispatch = dispatch; } - public String getMeetingKey() { - return meetingKey; - } - public Long getToolSessionID() { return toolSessionID; } + public void setToolSessionID(Long toolSessionID) { + this.toolSessionID = toolSessionID; + } + public String getTopic() { return topic; } - public void setDispatch(String dispatch) { - this.dispatch = dispatch; + public void setTopic(String topic) { + this.topic = topic; } + public Integer getMaxAttendeeMikes() { + return maxAttendeeMikes; + } + public void setMaxAttendeeMikes(Integer maxAttendeeMikes) { this.maxAttendeeMikes = maxAttendeeMikes; } - - public void setMeetingKey(String meetingKey) { - this.meetingKey = meetingKey; - } - - public void setToolSessionID(Long toolSessionID) { - this.toolSessionID = toolSessionID; - } - - public void setTopic(String topic) { - this.topic = topic; - } } 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.3 -r1.4 --- lams_tool_dimdim/web/pages/authoring/basic.jsp 12 Sep 2008 08:05:49 -0000 1.3 +++ lams_tool_dimdim/web/pages/authoring/basic.jsp 19 Sep 2008 06:18:57 -0000 1.4 @@ -44,14 +44,6 @@ - - : - - - - - - : 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.5 -r1.6 --- lams_tool_dimdim/web/pages/monitoring/summary.jsp 16 Sep 2008 00:11:05 -0000 1.5 +++ lams_tool_dimdim/web/pages/monitoring/summary.jsp 19 Sep 2008 06:18:57 -0000 1.6 @@ -89,12 +89,6 @@ - - - - : - -