Author: solomax
Date: Wed Dec 17 05:38:56 2014
New Revision: 1646159
URL: http://svn.apache.org/r1646159
Log:
[OPENMEETINGS-954] video list creation is fixed; code clean up
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MobileService.java
Wed Dec 17 05:38:56 2014
@@ -41,6 +41,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -118,7 +119,7 @@ public class MobileService {
for (IConnection conn :
current.getScope().getClientConnections()) {
if (conn != null && conn instanceof
IServiceCapableConnection) {
Client c =
sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (c.getIsAVClient()) {
+ if (c.getIsAVClient() &&
!Strings.isEmpty(c.getAvsettings())) {
Map<String, Object> map = new
Hashtable<String, Object>();
map.put("streamId", c.getStreamid());
map.put("broadCastId",
c.getBroadCastID());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java
Wed Dec 17 05:38:56 2014
@@ -424,7 +424,7 @@ public class RoomManager implements IRoo
r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setIspublic(ispublic);
r.setAllowUserQuestions(allowUserQuestions);
- r.setIsAudioOnly(isAudioOnly);
+ r.setAudioOnly(isAudioOnly);
r.setAllowFontStyles(allowFontStyles);
r.setAppointment(appointment);
@@ -527,7 +527,7 @@ public class RoomManager implements IRoo
r.setIspublic(ispublic);
r.setAllowUserQuestions(allowUserQuestions);
- r.setIsAudioOnly(isAudioOnly);
+ r.setAudioOnly(isAudioOnly);
r.setAllowFontStyles(allowFontStyles);
r.setAppointment(appointment);
@@ -769,7 +769,7 @@ public class RoomManager implements IRoo
r.setRoomtype(roomTypeDao.get(roomtypesId));
r.setUpdatetime(new Date());
r.setAllowUserQuestions(allowUserQuestions);
- r.setIsAudioOnly(isAudioOnly);
+ r.setAudioOnly(isAudioOnly);
r.setAllowFontStyles(allowFontStyles);
r.setIsDemoRoom(isDemoRoom);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
Wed Dec 17 05:38:56 2014
@@ -41,6 +41,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.OrganisationUser;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IConnection;
import org.red5.server.api.Red5;
@@ -118,7 +119,7 @@ public class MobileService {
for (IConnection conn :
current.getScope().getClientConnections()) {
if (conn != null && conn instanceof
IServiceCapableConnection) {
Client c =
sessionManager.getClientByStreamId(conn.getClient().getId(), null);
- if (c.getIsAVClient()) {
+ if (c.getIsAVClient() &&
!Strings.isEmpty(c.getAvsettings())) {
Map<String, Object> map = new
Hashtable<String, Object>();
map.put("streamId", c.getStreamid());
map.put("broadCastId",
c.getBroadCastID());
@@ -147,6 +148,7 @@ public class MobileService {
room.put("first", first);
room.put("users",
sessionManager.getClientListByRoom(r.getId()).size());
room.put("total", r.getNumberOfPartizipants());
+ room.put("audioOnly", r.isAudioOnly());
result.add(room);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java
Wed Dec 17 05:38:56 2014
@@ -116,7 +116,7 @@ public class FlvRecordingMetaDataDao {
flvRecordingMetaData.setRecordStart(recordStart);
- flvRecordingMetaData.setIsAudioOnly(isAudioOnly);
+ flvRecordingMetaData.setAudioOnly(isAudioOnly);
flvRecordingMetaData.setIsVideoOnly(isVideoOnly);
flvRecordingMetaData.setScreenData(isScreenData);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
Wed Dec 17 05:38:56 2014
@@ -99,7 +99,7 @@ public class FlvRecordingMetaData implem
@Column(name = "is_audio_only")
@Element(data = true)
- private Boolean isAudioOnly;
+ private boolean audioOnly;
@Column(name = "is_video_only")
@Element(data = true)
@@ -188,12 +188,12 @@ public class FlvRecordingMetaData implem
this.freeTextUserName = freeTextUserName;
}
- public Boolean getIsAudioOnly() {
- return isAudioOnly;
+ public boolean isAudioOnly() {
+ return audioOnly;
}
- public void setIsAudioOnly(Boolean isAudioOnly) {
- this.isAudioOnly = isAudioOnly;
+ public void setAudioOnly(boolean audioOnly) {
+ this.audioOnly = audioOnly;
}
public Boolean getIsVideoOnly() {
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=1646159&r1=1646158&r2=1646159&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 Dec 17 05:38:56 2014
@@ -156,7 +156,7 @@ public class Room implements IDataProvid
@Column(name = "is_audio_only")
@Element(data = true, required = false)
- private Boolean isAudioOnly;
+ private boolean audioOnly;
@Column(name = "allow_font_styles", nullable = false)
@Element(data = true, required = false)
@@ -397,12 +397,12 @@ public class Room implements IDataProvid
this.allowUserQuestions = allowUserQuestions;
}
- public Boolean getIsAudioOnly() {
- return isAudioOnly;
+ public boolean isAudioOnly() {
+ return audioOnly;
}
- public void setIsAudioOnly(Boolean isAudioOnly) {
- this.isAudioOnly = isAudioOnly;
+ public void setAudioOnly(boolean audioOnly) {
+ this.audioOnly = audioOnly;
}
public boolean getAllowFontStyles() {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Wed Dec 17 05:38:56 2014
@@ -501,7 +501,7 @@ public class ImportInitvalues {
r.setRoomtype(roomTypeDao.get(typeId));
r.setIspublic(isPublic);
r.setAllowUserQuestions(true);
- r.setIsAudioOnly(false);
+ r.setAudioOnly(false);
r.setAllowFontStyles(true);
r.setAppointment(false);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
Wed Dec 17 05:38:56 2014
@@ -108,11 +108,11 @@ Enter key password for <red5>
<source><![CDATA[keytool -import -alias
red5 -keystore red5/conf/keystore -trustcacerts -file
demo.openmeetings.de.crt]]></source>
</li>
<li>Please NOTE according to this <a
href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html";>http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a>
- guide you can split keystore and
truststore
+ guide you can split keystore and
truststore (OPTIONAL you might just copy keystore to truststore)
</li>
- <li>
- Create additional certificate as described above.
- Add this certificate to the following keystores:
<tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>.
+ <li>Create additional certificate as described above.
+ Add this certificate to the following keystores:
<tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>. (This step
is required to be able to use
+ screen-sharing web application, you can copy "main"
keystore while testing)
</li>
</ol>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Wed Dec 17 05:38:56 2014
@@ -159,7 +159,7 @@ public class RoomForm extends AdminBaseF
demoTime.setLabel(new Model<String>(WebSession.getString(637)));
add(demoTime);
add(new CheckBox("allowUserQuestions"));
- add(new CheckBox("isAudioOnly"));
+ add(new CheckBox("audioOnly"));
add(new CheckBox("allowFontStyles"));
add(new CheckBox("isClosed"));
add(new TextField<String>("redirectURL"));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
Wed Dec 17 05:38:56 2014
@@ -110,7 +110,7 @@
<div class="formelement">
<wicket:ommessage key="880" />
<br/>
- <label><wicket:ommessage
key="1076" /></label><input type="checkbox" class="formcheckbox"
wicket:id="isAudioOnly" />
+ <label><wicket:ommessage
key="1076" /></label><input type="checkbox" class="formcheckbox"
wicket:id="audioOnly" />
</div>
<div class="formelement">
<div
class="info-text"><wicket:ommessage key="1077" /></div>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1646159&r1=1646158&r2=1646159&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Wed Dec 17 05:38:56 2014
@@ -143,7 +143,7 @@ public class RoomPanel extends BasePanel
Room r = getBean(RoomDao.class).get(roomId);
target.appendJavaScript(String.format("initVideo(%s);", new JSONObject()
.put("uid", c.getUid())
- .put("audioOnly",
r.getIsAudioOnly())
+ .put("audioOnly",
r.isAudioOnly())
.put("SID", WebSession.getSid())
.put("interview", 4L ==
r.getRoomtype().getId()) //FIXME hardcoded
.put("protocol",
cfgDao.getConfValue(CONFIG_FLASH_PROTOCOL, String.class, ""))
