BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ritzalam/try-using-event-bus' into breakout-rooms

Browse Source
This commit is contained in:
Ghazi Triki 2015-11-03 21:40:30 +01:00
commit c9e521a551
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
View File

@ -444,7 +444,8 @@ public class MeetingService implements MessageListener {
private void processCreateBreakoutRoom(CreateBreakoutRoom message) {
Map<String, String> params = new HashMap<String, String>();
params.put("name", message.name);
params.put("meetingID", message.meetingId);
params.put("breakoutId", message.breakoutId);
params.put("meetingID", message.parentId);
params.put("attendeePW", message.viewerPassword);
params.put("moderatorPW", message.moderatorPassword);
params.put("voiceBridge", message.voiceConfId);

13
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
View File

@ -69,9 +69,16 @@ public class MeetingMessageHandler implements MessageHandler {
Gson gson = new Gson();
CreateBreakoutRoomRequest msg = gson.fromJson(message, CreateBreakoutRoomRequest.class);
for (MessageListener listener : listeners) {
listener.handle(new CreateBreakoutRoom(msg.payload.meetingId,
msg.payload.name, msg.payload.voiceConfId, msg.payload.viewerPassword,
msg.payload.moderatorPassword, msg.payload.durationInMinutes, msg.payload.defaultPresentationURL));
listener.handle(new CreateBreakoutRoom(
msg.payload.breakoutId,
msg.payload.parentId,
msg.payload.name,
msg.payload.voiceConfId,
msg.payload.viewerPassword,
msg.payload.moderatorPassword,
msg.payload.durationInMinutes,
msg.payload.defaultPresentationURL));
}
}
}

8
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/messages/CreateBreakoutRoom.java
View File

@ -3,7 +3,8 @@ package org.bigbluebutton.api.messaging.messages;
public class CreateBreakoutRoom implements IMessage {
public final String meetingId; // The main meeting internal id
public final String breakoutId;
public final String parentId; // The main meeting internal id
public final String name; // The name of the breakout room
public final String voiceConfId; // The voice conference id
public final String viewerPassword;
@ -11,10 +12,11 @@ public class CreateBreakoutRoom implements IMessage {
public final Integer durationInMinutes; // The duration of the breakout room
public final String defaultPresentationURL;
public CreateBreakoutRoom(String meetingId, String name,
public CreateBreakoutRoom(String breakoutId, String parentId, String name,
String voiceConfId, String viewerPassword, String moderatorPassword,
Integer duration, String defaultPresentationURL) {
this.meetingId = meetingId;
this.breakoutId = breakoutId;
this.parentId = parentId;
this.name = name;
this.voiceConfId = voiceConfId;
this.viewerPassword = viewerPassword;