You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/02/23 20:30:36 UTC
svn commit: r1292911 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
./ WebContent/WEB-INF/ src/app/org/openmeetings/app/remote/red5/
src/app/org/openmeetings/servlet/outputhandler/ src/client/ src/server/
src/templates/ src/test/org/openmeeting...
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1292911&r1=1292910&r2=1292911&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Thu Feb 23 19:30:35 2012
@@ -49,13 +49,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.FLVRecorderService;
import org.openmeetings.app.remote.WhiteBoardService;
-import org.openmeetings.server.beans.ServerFrameBean;
-import org.openmeetings.server.beans.ServerFrameCursorStatus;
-import org.openmeetings.server.beans.ServerSharingSessionBean;
-import org.openmeetings.server.beans.messages.ScreenSharingCursor;
-import org.openmeetings.server.beans.messages.ScreenSharingMessage;
-import org.openmeetings.server.beans.messages.ScreenSharingNewFrame;
-import org.openmeetings.server.cache.ServerSharingSessionList;
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.adapter.ApplicationAdapter;
@@ -2420,406 +2413,6 @@ public class ScopeApplicationAdapter ext
return 1;
}
-
- public synchronized void sendScreenSharingCursorPos(
- ServerFrameCursorStatus cursorStatus) {
- try {
-
- ScreenSharingCursor screenSharingCursor = new ScreenSharingCursor();
- screenSharingCursor.setS(cursorStatus.getPublicSID());
- screenSharingCursor.setX(cursorStatus.getX());
- screenSharingCursor.setY(cursorStatus.getY());
-
- String publicSID = cursorStatus.getPublicSID();
-
- IScope globalScope = getContext().getGlobalScope();
- IScope webAppKeyScope = globalScope
- .getScope(OpenmeetingsVariables.webAppRootKey);
-
- // Get Room Id to send it to the correct Scope
- RoomClient currentClient = this.clientListManager
- .getClientByPublicSID(publicSID, false);
-
- if (currentClient == null) {
- return;
- // throw new
- // Exception("Could not Find RoomClient on List "+publicSID);
- }
- // default Scope Name
- String scopeName = "hibernate";
- if (currentClient.getRoom_id() != null) {
- scopeName = currentClient.getRoom_id().toString();
- }
-
- IScope scopeHibernate = webAppKeyScope.getScope(scopeName);
-
- // log.debug("scopeHibernate "+scopeHibernate);
-
- if (scopeHibernate != null) {
- // Notify the clients of the same scope (room) with user_id
-
- Collection<Set<IConnection>> conCollection = webAppKeyScope
- .getScope(scopeName).getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection conn : conset) {
- if (conn != null) {
-
- RoomClient rcl = this.clientListManager
- .getClientByStreamId(conn.getClient()
- .getId());
- // log.debug("rcl "+rcl+" rcl.getUser_id(): "+rcl.getPublicSID()+" publicSID: "+publicSID+
- // " IS EQUAL? "+rcl.getPublicSID().equals(publicSID));
-
- if (rcl == null) {
- // continue;
- } else if (rcl.getIsScreenClient() != null
- && rcl.getIsScreenClient()) {
- // continue;
- } else {
- // Do not send to self and only to registered
- // viewers
- if (!rcl.getPublicSID().equals(publicSID)) {
-
- boolean sharerOnList = false;
- if (rcl.getSharerSIDs().size() > 0) {
- sharerOnList = true;
- break;
- }
-
- if (sharerOnList) {
- // log.debug("IS EQUAL ");
- ((IServiceCapableConnection) conn)
- .invoke("newScreenCursorPosition",
- new Object[] { screenSharingCursor },
- this);
- // log.debug("sendMessageWithClientByPublicSID RPC:newMessageByRoomAndDomain"+screenSharingCursor);
- }
- }
- }
- }
- }
- }
-
- } else {
- // Scope not yet started
- throw new Exception(
- "ScreenSharing Message but no Scope to send");
- }
-
- } catch (Exception err) {
- log.error("[sendScreenSharingMessage] ", err);
- err.printStackTrace();
- }
- }
-
- public synchronized void sendScreenSharingFrame(
- ServerFrameBean serverFrameBean) {
- try {
-
- ScreenSharingNewFrame screenSharingNewFrame = new ScreenSharingNewFrame();
- screenSharingNewFrame.setS(serverFrameBean.getPublicSID());
- screenSharingNewFrame.setX(serverFrameBean.getXValue());
- screenSharingNewFrame.setY(serverFrameBean.getYValue());
- screenSharingNewFrame.setH(serverFrameBean.getHeight());
- screenSharingNewFrame.setW(serverFrameBean.getWidth());
-
- String publicSID = serverFrameBean.getPublicSID();
-
- IScope globalScope = getContext().getGlobalScope();
- IScope webAppKeyScope = globalScope
- .getScope(OpenmeetingsVariables.webAppRootKey);
-
- // log.debug("webAppKeyScope "+webAppKeyScope);
-
- // Get Room Id to send it to the correct Scope
- RoomClient currentClient = this.clientListManager
- .getClientByPublicSID(publicSID, false);
-
- if (currentClient == null) {
- return;
- // throw new
- // Exception("Could not Find RoomClient on List "+publicSID);
- }
- // default Scope Name
- String scopeName = "hibernate";
- if (currentClient.getRoom_id() != null) {
- scopeName = currentClient.getRoom_id().toString();
- }
-
- IScope scopeHibernate = webAppKeyScope.getScope(scopeName);
-
- // log.debug("scopeHibernate "+scopeHibernate);
-
- if (scopeHibernate != null) {
- // Notify the clients of the same scope (room) with user_id
-
- Collection<Set<IConnection>> conCollection = webAppKeyScope
- .getScope(scopeName).getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection conn : conset) {
- if (conn != null) {
-
- RoomClient rcl = this.clientListManager
- .getClientByStreamId(conn.getClient()
- .getId());
- // log.debug("rcl "+rcl+" rcl.getUser_id(): "+rcl.getPublicSID()+" publicSID: "+publicSID+
- // " IS EQUAL? "+rcl.getPublicSID().equals(publicSID));
-
- if (rcl == null) {
- // continue;
- } else if (rcl.getIsScreenClient() != null
- && rcl.getIsScreenClient()) {
- // continue;
- } else {
- // Do not send to self and only to registered
- // viewers
- if (!rcl.getPublicSID().equals(publicSID)) {
-
- boolean sharerOnList = false;
- if (rcl.getSharerSIDs().size() > 0) {
- sharerOnList = true;
- break;
- }
-
- if (sharerOnList) {
- // log.debug("IS EQUAL ");
- ((IServiceCapableConnection) conn)
- .invoke("newScreenFrame",
- new Object[] { screenSharingNewFrame },
- this);
- // log.debug("sendMessageWithClientByPublicSID RPC:newMessageByRoomAndDomain"+screenSharingNewFrame);
- }
- }
- }
- }
- }
- }
-
- } else {
- // Scope not yet started
- throw new Exception(
- "ScreenSharing Message but no Scope to send");
- }
-
- } catch (Exception err) {
- log.error("[sendScreenSharingMessage] ", err);
- err.printStackTrace();
- }
- }
-
- /**
- * @deprecated we will not use further the old screensharing implementation
- * @return
- */
- public List<ScreenSharingMessage> checkSharingSession() {
- try {
- IConnection current = Red5.getConnectionLocal();
- RoomClient currentClient = this.clientListManager
- .getClientByStreamId(current.getClient().getId());
-
- HashMap<String, RoomClient> roomClientList = this.clientListManager
- .getClientListByRoom(currentClient.getRoom_id());
-
- List<ScreenSharingMessage> screenSharingMessageList = new LinkedList<ScreenSharingMessage>();
-
- for (Iterator<String> iter = roomClientList.keySet().iterator(); iter
- .hasNext();) {
-
- RoomClient rcl = roomClientList.get(iter.next());
-
- ServerSharingSessionBean serverSharingSessionBean = ServerSharingSessionList
- .getServerSharingSessionBeanByPublicSID(rcl
- .getPublicSID());
-
- if (serverSharingSessionBean != null) {
- ScreenSharingMessage screenSharingMessage = new ScreenSharingMessage();
- screenSharingMessage.setS(serverSharingSessionBean
- .getPublicSID());
- screenSharingMessage.setW(serverSharingSessionBean
- .getWidth());
-
- screenSharingMessage.setDeleted(serverSharingSessionBean
- .isDeleted());
-
- screenSharingMessage
- .setL(new LinkedList<ScreenSharingNewFrame>());
-
- for (ServerFrameBean serverFrameBean : serverSharingSessionBean
- .getServerFrameBeans()) {
-
- ScreenSharingNewFrame screenSharingNewFrame = new ScreenSharingNewFrame();
- screenSharingNewFrame.setX(serverFrameBean.getXValue());
- screenSharingNewFrame.setY(serverFrameBean.getYValue());
- screenSharingNewFrame.setH(serverFrameBean.getHeight());
- screenSharingNewFrame.setW(serverFrameBean.getWidth());
-
- screenSharingMessage.getL().add(screenSharingNewFrame);
-
- }
-
- screenSharingMessageList.add(screenSharingMessage);
- }
- }
-
- return screenSharingMessageList;
-
- } catch (Exception err) {
- log.error("[checkSharingSession] ", err);
- }
- return null;
- }
-
- public void registerViewerSession(boolean register, String publicSID) {
- try {
- IConnection current = Red5.getConnectionLocal();
- RoomClient currentClient = this.clientListManager
- .getClientByStreamId(current.getClient().getId());
-
- if (register) {
- // Add User to Session
- currentClient.getSharerSIDs().add(publicSID);
- } else {
- // Remove User from Session
- currentClient.getSharerSIDs().remove(publicSID);
-
- }
-
- // currentClient.setViewer(register);
-
- this.clientListManager.updateClientByStreamId(current.getClient()
- .getId(), currentClient);
-
- } catch (Exception err) {
- log.error("[checkSharingSession] ", err);
- }
- }
-
- public boolean checkSharerSession() {
- try {
- IConnection current = Red5.getConnectionLocal();
- RoomClient currentClient = this.clientListManager
- .getClientByStreamId(current.getClient().getId());
-
- ServerSharingSessionBean serverSharingSessionBean = ServerSharingSessionList
- .getServerSharingSessionBeanByPublicSID(currentClient
- .getPublicSID());
-
- if (serverSharingSessionBean == null) {
- return true;
- } else if (serverSharingSessionBean.isDeleted()) {
- return true;
- } else {
- return false;
- }
-
- } catch (Exception err) {
- log.error("[checkSharingSession] ", err);
- }
- return true;
- }
-
- public synchronized void sendScreenSharingMessage(
- ServerSharingSessionBean serverSharingSessionBean) {
- try {
-
- log.debug("sendScreenSharingMessage ");
-
- ScreenSharingMessage screenSharingMessage = new ScreenSharingMessage();
- screenSharingMessage.setS(serverSharingSessionBean.getPublicSID());
- screenSharingMessage.setW(serverSharingSessionBean.getWidth());
-
- screenSharingMessage.setDeleted(serverSharingSessionBean
- .isDeleted());
-
- screenSharingMessage.setL(new LinkedList<ScreenSharingNewFrame>());
-
- for (ServerFrameBean serverFrameBean : serverSharingSessionBean
- .getServerFrameBeans()) {
-
- ScreenSharingNewFrame screenSharingNewFrame = new ScreenSharingNewFrame();
- screenSharingNewFrame.setX(serverFrameBean.getXValue());
- screenSharingNewFrame.setY(serverFrameBean.getYValue());
- screenSharingNewFrame.setH(serverFrameBean.getHeight());
- screenSharingNewFrame.setW(serverFrameBean.getWidth());
-
- screenSharingMessage.getL().add(screenSharingNewFrame);
-
- }
-
- String publicSID = serverSharingSessionBean.getPublicSID();
-
- IScope globalScope = getContext().getGlobalScope();
- IScope webAppKeyScope = globalScope
- .getScope(OpenmeetingsVariables.webAppRootKey);
-
- // log.debug("webAppKeyScope "+webAppKeyScope);
-
- // Get Room Id to send it to the correct Scope
- RoomClient currentClient = this.clientListManager
- .getClientByPublicSID(publicSID, false);
-
- if (currentClient == null) {
- return;
- // throw new Exception("Could not Find RoomClient on List");
- }
- // default Scope Name
- String scopeName = "hibernate";
- if (currentClient.getRoom_id() != null) {
- scopeName = currentClient.getRoom_id().toString();
- }
-
- IScope scopeHibernate = webAppKeyScope.getScope(scopeName);
-
- // log.debug("scopeHibernate "+scopeHibernate);
-
- if (scopeHibernate != null) {
- // Notify the clients of the same scope (room) with user_id
-
- Collection<Set<IConnection>> conCollection = webAppKeyScope
- .getScope(scopeName).getConnections();
- for (Set<IConnection> conset : conCollection) {
- for (IConnection conn : conset) {
- if (conn != null) {
-
- RoomClient rcl = this.clientListManager
- .getClientByStreamId(conn.getClient()
- .getId());
- // log.debug("rcl "+rcl+" rcl.getUser_id(): "+rcl.getPublicSID()+" publicSID: "+publicSID+
- // " IS EQUAL? "+rcl.getPublicSID().equals(publicSID));
-
- if (rcl == null) {
- // continue;
- } else if (rcl.getIsScreenClient() != null
- && rcl.getIsScreenClient()) {
- // continue;
- } else {
- // Send to self for debugging
- if (!rcl.getPublicSID().equals(publicSID) || true) {
- // log.debug("IS EQUAL ");
- ((IServiceCapableConnection) conn)
- .invoke("newScreenSharing",
- new Object[] { screenSharingMessage },
- this);
- log.debug("sendMessageWithClientByPublicSID RPC:newMessageByRoomAndDomain"
- + screenSharingMessage);
- }
- }
- }
- }
- }
-
- } else {
- // Scope not yet started
- throw new Exception(
- "ScreenSharing Message but no Scope to send");
- }
-
- } catch (Exception err) {
- log.error("[sendScreenSharingMessage] ", err);
- err.printStackTrace();
- }
- }
-
public synchronized void sendMessageWithClientByPublicSID(Object message,
String publicSID) {
try {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1292911&r1=1292910&r2=1292911&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java Thu Feb 23 19:30:35 2012
@@ -34,7 +34,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.rtp.RTPScreenSharingSession;
import org.openmeetings.app.rtp.RTPStreamingHandler;
-import org.openmeetings.server.socket.ServerSocketMinaProcess;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
@@ -220,9 +219,8 @@ public class ScreenRequestHandler extend
.getConfKey(3L, "screen_viewer");
String template = "screencast_odsp_sharertemplate.vm";
- // template = "screencast_odsp_sharertemplate.vm";
- ctx.put("PORT", ServerSocketMinaProcess.port);
+
log.debug("language_id :: " + language_id);
Fieldmanagment fieldmanagment = getFieldmanagment();
@@ -357,12 +355,8 @@ public class ScreenRequestHandler extend
} else if (conf_i == 3) {
- // For the UDP Sharer, we need some additional
- // information
+ // Sharing option 3 is no more actively maintained and in the source available
- template = "screencast_odsp_sharertemplate.vm";
- ctx.put("PORT", ServerSocketMinaProcess.port);
- log.debug("Creating JNLP Template for TCP solution");
} else if (conf_i == 4) {
@@ -435,11 +429,7 @@ public class ScreenRequestHandler extend
} catch (Exception e) {
log.error("invalid configuration value for key screen_viewer!");
}
- } else if (mode.equals("viewer")) {
- template = "screencast_odsp_viewertemplate.vm";
- ctx.put("PORT", ServerSocketMinaProcess.port);
- log.debug("Creating JNLP Template for UDP solution");
- }
+ }
log.debug("template " + template);
Modified: incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm?rev=1292911&r1=1292910&r2=1292911&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/templates/install_step1_EN.vm Thu Feb 23 19:30:35 2012
@@ -320,8 +320,6 @@ function checkEmail()
<label for="screen_viewer">Screenviewer Config</label>
<select name="screen_viewer" id="screen_viewer" size="1">
<option value="4" selected>Rtmp Viewer (Standard)</option>
- <option value="3">ODSP Viewer</option>
- <option value="2">JMF RTP Sharer</option>
</select><br />
</li>
<p><i>