Index: lams_tool_bbb/db/sql/create_lams_tool_bbb.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/db/sql/create_lams_tool_bbb.sql,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_tool_bbb/db/sql/create_lams_tool_bbb.sql 4 May 2011 09:16:38 -0000 1.1.2.1 +++ lams_tool_bbb/db/sql/create_lams_tool_bbb.sql 28 May 2011 01:18:14 -0000 1.1.2.2 @@ -10,7 +10,7 @@ create table tl_labbb10_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, bbb_uid bigint, primary key (uid)); create table tl_labbb10_config (uid bigint not null auto_increment, config_key varchar(255), config_value varchar(255), primary key (uid)); create table tl_labbb10_bbb (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, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, primary key (uid)); -create table tl_labbb10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), bbb_uid bigint, meeting_created bit, meeting_key varchar(255), attendee_password varchar(20), moderator_password varchar(20), primary key (uid)); +create table tl_labbb10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), bbb_uid bigint, meeting_created bit, meeting_key varchar(255), attendee_password varchar(20), moderator_password varchar(20), voice_bridge varchar(20), primary key (uid)); create table tl_labbb10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, bbb_session_uid bigint, notebook_entry_uid bigint, primary key (uid)); -- end generated sql Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbSession.java,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbSession.java 4 May 2011 02:23:41 -0000 1.1 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/model/BbbSession.java 28 May 2011 01:18:14 -0000 1.1.2.1 @@ -66,6 +66,8 @@ private String attendeePassword; private String moderatorPassword; + + private String voiceBridge; // Property accessors @@ -204,7 +206,19 @@ this.moderatorPassword = moderatorPassword; } + public void setVoiceBridge(String voiceBridge) { + this.voiceBridge = voiceBridge; + } + /** + * @hibernate.property column="voice_bridge" + * @return the moderatorPassword + */ + public String getVoiceBridge() { + return voiceBridge; + } + + /** * toString * * @return String Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 4 May 2011 02:23:41 -0000 1.1 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 28 May 2011 01:18:14 -0000 1.1.2.1 @@ -86,6 +86,8 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.audit.IAuditService; +import com.mysql.jdbc.Util; + /** * An implementation of the IBbbService interface. * @@ -460,6 +462,8 @@ String checkSum = DigestUtils.shaHex("join" + queryString + securitySalt); String url = serverURL + joinParam + queryString + "&checksum=" + checkSum; + + logger.debug("Join URL: " + url); return url; } @@ -497,7 +501,7 @@ public String startConference(String meetingKey, String atendeePassword, String moderatorPassword, String returnURL, - String welcomeMessage) + String welcomeMessage, String voiceBridge) throws Exception { String serverURL = getConfigValue(Constants.CFG_SERVER_URL); @@ -508,19 +512,20 @@ logger.error("Config item : '" + Constants.CFG_SERVER_URL + "' not defined"); throw new BbbException("Standard server url not defined"); } - + String queryString = "name=" + URLEncoder.encode(meetingKey, "UTF8") + "&meetingID=" + URLEncoder.encode(meetingKey, "UTF8") + "&attendeePW=" + URLEncoder.encode(atendeePassword, "UTF8") + "&moderatorPW=" - + URLEncoder.encode(moderatorPassword, "UTF8") + "&logoutURL=" + + URLEncoder.encode(moderatorPassword, "UTF8") + "&voiceBridge=" + + URLEncoder.encode(voiceBridge, "UTF8") + "&logoutURL=" + URLEncoder.encode(returnURL, "UTF8") + "&welcome=" + URLEncoder.encode(welcomeMessage, "UTF8"); logger.debug("queryString = " + queryString); String checkSum = DigestUtils.shaHex("create" + queryString + securitySalt); - + logger.debug("checksum = " + checkSum); URL url; @@ -530,7 +535,7 @@ + "&checksum=" + URLEncoder.encode(checkSum, "UTF8")); - logger.info("url = " + url); + logger.debug("url = " + url); String response; response = sendRequest(url); Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java 4 May 2011 02:23:41 -0000 1.1 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/IBbbService.java 28 May 2011 01:18:14 -0000 1.1.2.1 @@ -186,7 +186,7 @@ * @throws Exception */ String startConference(String meetingKey, String atendeePassword, String moderatorPassword, - String returnURL, String welcomeMessage) + String returnURL, String welcomeMessage, String voiceBridge) throws Exception; /** Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbUtil.java,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbUtil.java 4 May 2011 02:23:41 -0000 1.1 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/util/BbbUtil.java 28 May 2011 01:18:14 -0000 1.1.2.1 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.bbb.util; +import java.util.Random; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.servlet.http.HttpServletRequest; @@ -32,6 +33,8 @@ public class BbbUtil { + private static final char[] CHAR_ARRAY = "01234567890".toCharArray(); + public static String getMeetingKey(Long toolSessionId, String attendeePassword) { /* @@ -83,5 +86,22 @@ } + + + /** + * Get the next random password + * + * @param length - the length of the password + * @return the next random password + */ + public static String generateRandomNumbers(int length){ + char res[] = new char[length]; + Random generator = new Random(); + + for(int i=0; i