Author: solomax
Date: Wed Feb 4 15:02:55 2015
New Revision: 1657268
URL: http://svn.apache.org/r1657268
Log:
[OPENMEETINGS-1156] allow recording flags from room and soap-login are in
effect now
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
Wed Feb 4 15:02:55 2015
@@ -46,11 +46,9 @@ public class SOAPLoginDao {
boolean showNickNameDialog, String landingZone,
boolean allowRecording) {
try {
-
String thistime = "TIME_" + (new Date().getTime());
- String hash = ManageCryptStyle.getInstanceOfCrypt()
- .createPassPhrase(thistime);
+ String hash =
ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(thistime);
SOAPLogin soapLogin = new SOAPLogin();
soapLogin.setCreated(new Date());
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Client.java
Wed Feb 4 15:02:55 2015
@@ -366,7 +366,7 @@ public class Client implements IDataProv
private Integer interviewPodId = null;
/**
- * @see Client#getAllowRecording()
+ * @see Client#isAllowRecording()
*/
@Column(name = "allow_recording")
private boolean allowRecording = true;
@@ -827,7 +827,7 @@ public class Client implements IDataProv
this.canGiveAudio = canGiveAudio;
}
- public boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/room/Room.java
Wed Feb 4 15:02:55 2015
@@ -112,7 +112,7 @@ public class Room implements Serializabl
private boolean deleted;
@Column(name = "ispublic")
- @Element(data = true, required = false)
+ @Element(name = "ispublic", data = true, required = false)
private boolean ispublic;
@Column(name = "numberOfPartizipants")
@@ -143,7 +143,7 @@ public class Room implements Serializabl
// If this is true all participants of a meeting have to wait for the
// moderator to come into the room
@Column(name = "ismoderatedroom")
- @Element(data = true, required = false)
+ @Element(name="isModeratedRoom", data = true, required = false)
private boolean isModeratedRoom;
@Column(name = "allow_user_questions")
@@ -151,7 +151,7 @@ public class Room implements Serializabl
private Boolean allowUserQuestions;
@Column(name = "is_audio_only")
- @Element(data = true, required = false)
+ @Element(name = "isAudioOnly", data = true, required = false)
private Boolean isAudioOnly;
@Column(name = "allow_font_styles", nullable = false)
@@ -176,9 +176,8 @@ public class Room implements Serializabl
// recording
@Column(name = "allow_recording")
- @Element(data = true, required = false)
- private Boolean allowRecording; // Show or show not the recording
option in
- // a
conference room
+ @Element(name = "allowRecording", data = true, required = false)
+ private boolean allowRecording = true; // Show or show not the
recording option in a conference room
/**
* Layout of Room
*/
@@ -187,11 +186,11 @@ public class Room implements Serializabl
private Boolean hideTopBar = false;
@Column(name = "hide_chat")
- @Element(data = true, required = false)
+ @Element(name = "hideChat", data = true, required = false)
private Boolean hideChat = false;
@Column(name = "hide_activities_and_actions")
- @Element(data = true, required = false)
+ @Element(name = "hideActivitiesAndActions", data = true, required =
false)
private Boolean hideActivitiesAndActions = false;
@Column(name = "hide_files_explorer")
@@ -441,11 +440,11 @@ public class Room implements Serializabl
this.waitForRecording = waitForRecording;
}
- public Boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
- public void setAllowRecording(Boolean allowRecording) {
+ public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
Wed Feb 4 15:02:55 2015
@@ -31,7 +31,7 @@ import javax.persistence.Table;
@Entity
@Table(name = "soaplogin")
public class SOAPLogin implements Serializable {
- private static final long serialVersionUID = 5101010700038221434L;
+ private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="id")
@@ -177,7 +177,7 @@ public class SOAPLogin implements Serial
this.landingZone = landingZone;
}
- public boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
public void setAllowRecording(boolean allowRecording) {
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
Wed Feb 4 15:02:55 2015
@@ -254,7 +254,6 @@ public class MainService implements IPen
try {
log.debug("############### secureLoginByRemote " +
secureHash);
- System.out.println("############### secureLoginByRemote
" + secureHash);
String clientURL =
Red5.getConnectionLocal().getRemoteAddress();
@@ -287,7 +286,7 @@ public class MainService implements IPen
sessiondataDao.updateUser(SID,
currentClient.getUser_id());
}
-
currentClient.setAllowRecording(soapLogin.getAllowRecording());
+
currentClient.setAllowRecording(soapLogin.isAllowRecording());
sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
if (loginReturn == null) {
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Wed Feb 4 15:02:55 2015
@@ -36,9 +36,11 @@ import org.apache.commons.codec.binary.H
import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.velocity.VelocityContext;
@@ -65,6 +67,8 @@ public class ScreenController {
public ConfigurationDao cfgDao;
@Autowired
public FieldManager fieldManager;
+ @Autowired
+ public RoomDao roomDao;
private enum ConnectionType {
rtmp
@@ -86,8 +90,7 @@ public class ScreenController {
}
@RequestMapping(value = "/screen.upload")
- public void handleRequest(HttpServletRequest request,
- HttpServletResponse response) {
+ public void handleRequest(HttpServletRequest request,
HttpServletResponse response) {
try {
String sid = request.getParameter("sid");
Long users_id = sessiondataDao.checkSession(sid);
@@ -154,7 +157,8 @@ public class ScreenController {
if (roomId == null) {
throw new Exception("Client has no room " + rc);
}
- boolean allowRecording = rc.getAllowRecording() && (0
== sessionManager.getRecordingCount(roomId));
+ Room room = roomDao.get(roomId);
+ boolean allowRecording = room.isAllowRecording() &&
rc.isAllowRecording() && (0 == sessionManager.getRecordingCount(roomId));
boolean allowPublishing = (0 ==
sessionManager.getPublishingCount(roomId));
Context ctx = new VelocityContext();
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Wed Feb 4 15:02:55 2015
@@ -156,7 +156,6 @@ public class MainService implements IPen
try {
log.debug("############### secureLoginByRemote " +
secureHash);
- System.out.println("############### secureLoginByRemote
" + secureHash);
String clientURL =
Red5.getConnectionLocal().getRemoteAddress();
@@ -189,7 +188,7 @@ public class MainService implements IPen
sessiondataDao.updateUser(SID,
currentClient.getUser_id());
}
-
currentClient.setAllowRecording(soapLogin.getAllowRecording());
+
currentClient.setAllowRecording(soapLogin.isAllowRecording());
sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
if (loginReturn == null) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java
Wed Feb 4 15:02:55 2015
@@ -46,11 +46,9 @@ public class SOAPLoginDao {
boolean showNickNameDialog, String landingZone,
boolean allowRecording) {
try {
-
String thistime = "TIME_" + (new Date().getTime());
- String hash = ManageCryptStyle.getInstanceOfCrypt()
- .createPassPhrase(thistime);
+ String hash =
ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(thistime);
SOAPLogin soapLogin = new SOAPLogin();
soapLogin.setCreated(new Date());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
Wed Feb 4 15:02:55 2015
@@ -364,7 +364,7 @@ public class Client implements IDataProv
private Integer interviewPodId = null;
/**
- * @see Client#getAllowRecording()
+ * @see Client#isAllowRecording()
*/
@Column(name = "allow_recording")
private boolean allowRecording = true;
@@ -817,7 +817,7 @@ public class Client implements IDataProv
this.canGiveAudio = canGiveAudio;
}
- public boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
Wed Feb 4 15:02:55 2015
@@ -180,9 +180,8 @@ public class Room implements IDataProvid
// recording
@Column(name = "allow_recording")
- @Element(data = true, required = false)
- private Boolean allowRecording; // Show or show not the recording
option in
- // a
conference room
+ @Element(name = "allowRecording", data = true, required = false)
+ private boolean allowRecording = true; // Show or show not the
recording option in a conference room
/**
* Layout of Room
*/
@@ -445,11 +444,11 @@ public class Room implements IDataProvid
this.waitForRecording = waitForRecording;
}
- public Boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
- public void setAllowRecording(Boolean allowRecording) {
+ public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/SOAPLogin.java
Wed Feb 4 15:02:55 2015
@@ -177,7 +177,7 @@ public class SOAPLogin implements Serial
this.landingZone = landingZone;
}
- public boolean getAllowRecording() {
+ public boolean isAllowRecording() {
return allowRecording;
}
public void setAllowRecording(boolean allowRecording) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java?rev=1657268&r1=1657267&r2=1657268&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/StartSharingEventBehavior.java
Wed Feb 4 15:02:55 2015
@@ -100,7 +100,7 @@ public class StartSharingEventBehavior e
.replace("$defaultFps",
cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS, String.class, ""))
.replace("$showFps",
cfgDao.getConfValue(CONFIG_SCREENSHARING_FPS_SHOW, String.class, "true"))
.replace("$allowRemote",
cfgDao.getConfValue(CONFIG_SCREENSHARING_ALLOW_REMOTE, String.class, "true"))
- .replace("$allowRecording", "true")
//FIXME add/remove
+ .replace("$allowRecording", "true")
//FIXME add/remove Room.allowRecording + Client.allowRecording
.replace("$allowPublishing", "true")
//FIXME add/remove
.replace("$keystore", "--dummy--")
//FIXME add/remove
.replace("$password", "--dummy--")
//FIXME add/remove
