Revision: 3830
Author: seba.wagner
Date: Sun Jun 19 01:09:07 2011
Log: add some room attributes and new SOAP Call
http://code.google.com/p/openmeetings/source/detail?r=3830
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/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/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
/trunk/singlewebapp/test/test.txt
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sun Jun 19 01:09:07 2011
@@ -164,7 +164,9 @@
"", //
conferencePIN
null, // ownerID
null,
- null); // ownerID
+ null,
+ false //
+ );
log.debug("Appointmentlogic.saveAppointment : Room - " +
room_id);
log.debug("Appointmentlogic.saveAppointment : Reminder - " +
remind);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sun Jun 19 01:09:07 2011
@@ -822,7 +822,8 @@
String conferencePin,
Long ownerId,
Boolean waitForRecording,
- Boolean allowRecording){
+ Boolean allowRecording,
+ Boolean hideTopBar){
log.debug("addRoom");
@@ -845,6 +846,7 @@
r.setDemoTime(demoTime);
r.setIsModeratedRoom(isModeratedRoom);
+ r.setHideTopBar(hideTopBar);
r.setDeleted("false");
@@ -969,7 +971,8 @@
Boolean isClosed,
String redirectURL,
Boolean waitForRecording,
- Boolean allowRecording){
+ Boolean allowRecording,
+ Boolean hideTopBar){
log.debug("addExternalRoom");
@@ -1432,7 +1435,7 @@
* @param ispublic
* @param comment
* @return
- */
+ */
public Long updateRoom(long user_level, long rooms_id, long roomtypes_id,
String name,
boolean ispublic, String comment, Long numberOfPartizipants, List
organisations,
Boolean appointment,
@@ -1448,7 +1451,8 @@
String conferencePin,
Long ownerId,
Boolean waitForRecording,
- Boolean allowRecording){
+ Boolean allowRecording,
+ Boolean hideTopBar){
try {
log.debug("*** updateRoom numberOfPartizipants:
"+numberOfPartizipants);
if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
@@ -1469,6 +1473,7 @@
r.setAppointment(appointment);
r.setIsModeratedRoom(isModeratedRoom);
+ r.setHideTopBar(hideTopBar);
r.setIsClosed(isClosed);
r.setRedirectURL(redirectURL);
@@ -1839,7 +1844,8 @@
"", //conferencePin
ownerId,
null,
-
null
+
null,
+
false
);
if (rooms_id != null) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Mon Apr 25 06:16:00 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.hbm.xml
Sun Jun 19 01:09:07 2011
@@ -29,5 +29,6 @@
<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"/>
+ <property name="hideTopBar" type="boolean" column="hide_top_bar"/>
</class>
</hibernate-mapping>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Mon Apr 25 06:16:00 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/hibernate/beans/rooms/Rooms.java
Sun Jun 19 01:09:07 2011
@@ -73,6 +73,8 @@
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
+ private Boolean hideTopBar = false;
+
/**
* @hibernate.property
* column="comment_field"
@@ -554,7 +556,17 @@
this.allowRecording = allowRecording;
}
-
+ /**
+ * @hibernate.property
+ * column="hide_top_bar"
+ * type="boolean"
+ */
+ public Boolean getHideTopBar() {
+ return hideTopBar;
+ }
+ public void setHideTopBar(Boolean hideTopBar) {
+ this.hideTopBar = hideTopBar;
+ }
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Jun 19 01:09:07 2011
@@ -463,37 +463,37 @@
"", new Long(16), true, null, false, false,
null, false, null, true,
false, false, "", "", "", null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoom(3, "public Conference Room",
conference_Id,
"", new Long(32), true, null, false, false,
null, false, null, true,
false, false, "", "", "", null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoom(3, "public Video Only Room",
conference_Id,
"", new Long(32), true, null, false, false,
null, false, null, true,
false, false, "", "", "", null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoom(3,
"public Video And Whiteboard Room", conference_Id, "", new Long(32),
true,
null, false, false, null, false, null, true, false, false, "", "", "",
null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoom(3, "public Restricted Room",
restricted_Id,
"", new Long(100), true, null, false, false,
null, false, null, true,
false, false, "", "", "", null,
null,
- null);
+ null, false);
long room2 = Roommanagement.getInstance().addRoom(3,
"private Conference Room", conference_Id, "", new Long(32), false,
null,
false, false, null, false, null, true, false, false, "",
"", "", null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoomToOrganisation(3, room2, 1);
@@ -501,13 +501,13 @@
"public Audience Room", audience_Id, "", new
Long(32), true, null,
false, false, null, false, null, true, false, false, "",
"", "", null,
null,
- null);
+ null, false);
long room4 = Roommanagement.getInstance().addRoom(3,
"private Audience Room", audience_Id, "", new
Long(32), false, null,
false, false, null, false, null, true, false, false, "",
"", "", null,
null,
- null);
+ null, false);
Roommanagement.getInstance().addRoomToOrganisation(3, room4, 1);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Sun Jun 19 01:09:07 2011
@@ -543,7 +543,8 @@
argObjectMap.get("conferencePin").toString(),
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue(),
Boolean.valueOf(argObjectMap.get("waitForRecording").toString()),
-
Boolean.valueOf(argObjectMap.get("allowRecording").toString()));
+
Boolean.valueOf(argObjectMap.get("allowRecording").toString()),
+
Boolean.valueOf(argObjectMap.get("hideTopBar").toString()));
} else if (rooms_id>0){
return Roommanagement.getInstance().updateRoom(User_level,
rooms_id,
Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue(),
@@ -563,7 +564,8 @@
argObjectMap.get("conferencePin").toString(),
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue(),
Boolean.valueOf(argObjectMap.get("waitForRecording").toString()),
-
Boolean.valueOf(argObjectMap.get("allowRecording").toString()));
+
Boolean.valueOf(argObjectMap.get("allowRecording").toString()),
+
Boolean.valueOf(argObjectMap.get("hideTopBar").toString()));
}
} catch (Exception e){
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sun Jun 19 01:09:07 2011
@@ -811,7 +811,9 @@
"",
// conferencePIN
null,
// ownerId
null,
- null);
+ null,
+ false
+ );
room =
Roommanagement.getInstance().getRoomById(room_id);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Sun Jun 19 01:09:07 2011
@@ -197,7 +197,7 @@
Long returnVal =
Roommanagement.getInstance().addRoom(user_level, name, roomtypes_id,
comment,
numberOfPartizipants, ispublic, null,
false, false,
null, false, null, true, false, false, ""
- , "",
"", null, null, null);
+ , "",
"", null, null, null, false);
XStream xStream = new XStream(new
XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Sun Jun 19 01:09:07 2011
@@ -506,7 +506,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
false, false, null
- , false, null, true, false, false, "",
"", "", null, null, null);
+ , false, null, true, false, false, "", "", "", null, null, null,
false);
} catch (Exception err) {
log.error("[addRoom] ",err);
}
@@ -527,7 +527,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- true, false, false, "", "",
"", null, null, null);
+ true, false, false, "", "",
"", null, null, null, false);
} catch (Exception err) {
log.error("[addRoomWithModeration] ",err);
}
@@ -567,7 +567,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, false, false, "",
"", "", null, null, null);
+ allowUserQuestions, false, false, "", "", "", null, null, null,
false);
} catch (Exception err) {
log.error("[addRoomWithModerationAndQuestions] ",err);
}
@@ -590,7 +590,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, false, "", "", "", null, null,
null);
+ allowUserQuestions, isAudioOnly, false, "", "", "", null, null,
null, false);
} catch (Exception err) {
log.error("[addRoomWithModerationQuestionsAndAudioType]
",err);
throw new AxisFault(err.getMessage());
@@ -633,7 +633,7 @@
numberOfPartizipants, ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
externalRoomId,
externalRoomType, true, false, false, "",
- false, true);
+ false, true,
false);
} else {
roomId = room.getRooms_id();
}
@@ -698,7 +698,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
return Roommanagement.getInstance().updateRoom(user_level, rooms_id,
roomtypes_id, name, ispublic,
comment, numberOfPartizipants, null,
appointment, false, null, false,
- null,true,false, false, "", "", "",
null, null, null);
+ null,true,false, false, "", "", "",
null, null, null, false);
} catch (Exception err) {
log.error("[addRoom] ",err);
}
@@ -721,7 +721,7 @@
return Roommanagement.getInstance().updateRoom(user_level, room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom, demoTime,
isModeratedRoom,null,true,false,
- false, "", "", "", null, null, null);
+ false, "", "", "", null, null, null,
false);
} catch (Exception err) {
log.error("[updateRoomWithModeration] ",err);
}
@@ -745,7 +745,7 @@
return Roommanagement.getInstance().updateRoom(user_level, room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom, demoTime,
isModeratedRoom,
- null,allowUserQuestions,false, false, "", "",
"", null, null, null);
+ null,allowUserQuestions,false, false, "", "", "", null, null, null,
false);
} catch (Exception err) {
log.error("[updateRoomWithModerationAndQuestions]
",err);
}
@@ -786,7 +786,7 @@
roomtypes_id, comment,
numberOfPartizipants, ispublic,
null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
null, null, externalRoomType, true, false, false,
"",
- false, true);
+ false, true, false);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
@@ -806,7 +806,7 @@
roomtypes_id, comment,
numberOfPartizipants, ispublic,
null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
null, null, externalRoomType, allowUserQuestions, isAudioOnly,
false, "",
- false, true);
+ false, true, false);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
@@ -827,10 +827,32 @@
roomtypes_id, comment,
numberOfPartizipants, ispublic,
null, appointment, isDemoRoom,
demoTime, isModeratedRoom,
null, null, externalRoomType, allowUserQuestions, isAudioOnly,
false, "",
- waitForRecording, allowRecording);
+ waitForRecording, allowRecording,
false);
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
}
+ return new Long(-1);
+ }
+
+ public Long addRoomWithModerationExternalTypeAndTopBarOption(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,
+ Boolean hideTopBar) {
+ 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,
hideTopBar);
+ } catch (Exception err) {
+ log.error("[addRoomWithModeration] ", err);
+ }
return new Long(-1);
}
@@ -1269,7 +1291,9 @@
false, //isAudioOnly
false, //isClosed
redirectURL,
- false, true);
+ false,
+ true,
+ false);
if (rooms_id <= 0) {
return rooms_id;
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
Sun Jun 19 01:09:07 2011
@@ -18,7 +18,7 @@
public void testAddOrgRoom(){
long room = Roommanagement.getInstance().addRoom(3,"roomOrg", 1, "", new
Long(4), true,null,
- false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null, false);
Roommanagement.getInstance().addRoomToOrganisation(3,room, 1);
}
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
Mon Jun 13 10:23:41 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
Sun Jun 19 01:09:07 2011
@@ -23,11 +23,11 @@
// log.error("audience_Id: "+audience_Id);
long room = Roommanagement.getInstance().addRoom(3,"public Audience
Room", 2,"", new Long(4), false, null,
- false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null, false);
Roommanagement.getInstance().addRoomToOrganisation(3,room, 1);
long room2 = Roommanagement.getInstance().addRoom(3,"private Audience
Room", 2,"", new Long(4), true, null,
- false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null, false);
Roommanagement.getInstance().addRoomToOrganisation(3,room2, 1);
}
=======================================
--- /trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
Mon Jun 13 10:23:41 2011
+++ /trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
Sun Jun 19 01:09:07 2011
@@ -18,10 +18,10 @@
public void testRoomTest(){
//Public Rooms
long room1 = Roommanagement.getInstance().addRoom(3, "room1", 1, "", new
Long(4), true, null,
- false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null, false);
log.error("room1: "+room1);
long room2 = Roommanagement.getInstance().addRoom(3, "room1", 2, "", new
Long(4), true, null,
- true, false, null, false, null, true, false, false, "", "", "", null,
null, null);
+ true, false, null, false, null, true, false, false, "", "", "", null,
null, null, false);
log.error("room2: "+room2);
}
=======================================
--- /trunk/singlewebapp/test/test.txt Thu Oct 7 07:58:52 2010
+++ /trunk/singlewebapp/test/test.txt Sun Jun 19 01:09:07 2011
@@ -10,3 +10,10 @@
ffmpeg -i
C:\workspaces\workspace_openmeetings\ROOT\dist\red5\webapps\openmeetings\streams\1\INTERVIEW_12\image%20d.png
-r 25 -vcodec flv -qmax 1 -qmin 1
C:\workspaces\workspace_openmeetings\ROOT\dist\red5\webapps\openmeetings\streams\1\COMPLETE_INTERVIEW_12.flv
+
+http://localhost:5080/openmeetings/ScreenRequestHandler?rtmphostlocal=localhost&room=2&domain=public&organization_id=1&sid=4f35f0749b6c8d9541d16ea61fc763de&red5httpport=5080&connectionType=rtmp&port=1935&publicSID=6bdea20c314e1b48e4da999ea9e16d80&httpRootKey=/openmeetings/&languageAsString=1&record=no
+
+
+http://localhost:5080/openmeetings/ScreenRequestHandler?rtmphostlocal=localhost&room=6&domain=1&organization_id=1&sid=4f35f0749b6c8d9541d16ea61fc763de&red5httpport=5080&connectionType=rtmp&allowRecording=true&port=1935&publicSID=6bdea20c314e1b48e4da999ea9e16d80&httpRootKey=/openmeetings/&languageAsString=1&record=no
+
+
--
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.
