Revision: 3739
Author: seba.wagner
Date: Mon Apr 25 06:16:00 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3739
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Apr 25 06:16:00 2011
@@ -962,7 +962,9 @@
Boolean allowUserQuestions,
Boolean isAudioOnly,
Boolean isClosed,
- String redirectURL){
+ String redirectURL,
+ Boolean waitForRecording,
+ Boolean allowRecording){
log.debug("addExternalRoom");
@@ -993,6 +995,9 @@
r.setIsClosed(isClosed);
r.setRedirectURL(redirectURL);
+
+
r.setWaitForRecording(waitForRecording);
+
r.setAllowRecording(allowRecording);
Object idf = HibernateUtil.createSession();
Session session =
HibernateUtil.getSession();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Mon Apr 25 06:16:00 2011
@@ -27,5 +27,7 @@
<property name="isClosed" type="boolean" column="is_closed"/>
<property name="redirectURL" type="string" column="redirect_url"/>
<property name="ownerId" type="long" column="owner_id"/>
+ <property name="waitForRecording" type="boolean"
column="wait_for_recording"/>
+ <property name="allowRecording" type="boolean"
column="allow_recording"/>
</class>
</hibernate-mapping>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Mon Apr 25 06:16:00 2011
@@ -70,6 +70,8 @@
private String redirectURL;
private Long ownerId; //Those are the rooms from the myrooms section
+ private Boolean waitForRecording; //Show warning that user has to start
recording
+ private Boolean allowRecording; //Show or show not the recording option
in a conference room
/**
* @hibernate.property
@@ -527,6 +529,32 @@
public void setOwnerId(Long ownerId) {
this.ownerId = ownerId;
}
+
+ /**
+ * @hibernate.property
+ * column="wait_for_recording"
+ * type="boolean"
+ */
+ public Boolean getWaitForRecording() {
+ return waitForRecording;
+ }
+ public void setWaitForRecording(Boolean waitForRecording) {
+ this.waitForRecording = waitForRecording;
+ }
+
+ /**
+ * @hibernate.property
+ * column="allow_recording"
+ * type="boolean"
+ */
+ public Boolean getAllowRecording() {
+ return allowRecording;
+ }
+ public void setAllowRecording(Boolean allowRecording) {
+ this.allowRecording = allowRecording;
+ }
+
+
}
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Apr 18 05:08:54 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Apr 25 06:16:00 2011
@@ -632,7 +632,8 @@
roomId =
Roommanagement.getInstance().addExternalRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants, ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- externalRoomId,
externalRoomType, true, false, false, "");
+ externalRoomId,
externalRoomType, true, false, false, "",
+ false, true);
} else {
roomId = room.getRooms_id();
}
@@ -784,7 +785,8 @@
return
Roommanagement.getInstance().addExternalRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants, ispublic,
null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
- null, null, externalRoomType, true, false, false,
"");
+ null, null, externalRoomType, true, false, false,
"",
+ false, true);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
@@ -803,10 +805,32 @@
return
Roommanagement.getInstance().addExternalRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants, ispublic,
null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
- null, null, externalRoomType, allowUserQuestions, isAudioOnly,
false, "");
+ null, null, externalRoomType, allowUserQuestions, isAudioOnly,
false, "",
+ false, true);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
+ return new Long(-1);
+ }
+
+ public Long addRoomWithModerationAndRecordingFlags(String SID, String
name,
+ Long roomtypes_id, String comment, Long
numberOfPartizipants,
+ Boolean ispublic, Boolean appointment, Boolean
isDemoRoom,
+ Integer demoTime, Boolean isModeratedRoom, String
externalRoomType,
+ Boolean allowUserQuestions, Boolean isAudioOnly,
+ Boolean waitForRecording, Boolean allowRecording) {
+ try {
+ Long users_id =
Sessionmanagement.getInstance().checkSession(SID);
+ Long user_level =
Usermanagement.getInstance().getUserLevelByID(
+ users_id);
+ return
Roommanagement.getInstance().addExternalRoom(user_level, name,
+ roomtypes_id, comment,
numberOfPartizipants, ispublic,
+ null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
+ null, null, externalRoomType, allowUserQuestions, isAudioOnly,
false, "",
+ waitForRecording, allowRecording);
+ } catch (Exception err) {
+ log.error("[addRoomWithModeration] ", err);
+ }
return new Long(-1);
}
@@ -1244,7 +1268,8 @@
false, //allowUserQuestions
false, //isAudioOnly
false, //isClosed
- redirectURL);
+ redirectURL,
+ false, true);
if (rooms_id <= 0) {
return rooms_id;
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
