This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2585-IKurentoHandler-class in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 5726cac6d0ab01326ee06e202b530caf725bc74d Author: Sebastian Wagner <[email protected]> AuthorDate: Thu Mar 4 20:16:21 2021 +1300 OPENMEETINGS-2585 Add IKurentoHandler class and IStreamHandler methods. --- openmeetings-web/pom.xml | 4 ++-- .../openmeetings/web/admin/connection/ConnectionsPanel.java | 8 ++++---- .../main/java/org/apache/openmeetings/web/app/ClientManager.java | 4 ++-- .../main/java/org/apache/openmeetings/web/app/TimerService.java | 4 ++-- .../java/org/apache/openmeetings/web/common/OmWebSocketPanel.java | 4 ++-- .../src/main/java/org/apache/openmeetings/web/room/RoomPanel.java | 8 ++++---- .../java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 8 ++++---- .../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 4 ++-- .../org/apache/openmeetings/web/room/wb/InterviewWbPanel.java | 4 ++-- .../src/main/webapp/WEB-INF/classes/applicationContext.xml | 4 ++++ 10 files changed, 28 insertions(+), 24 deletions(-) diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 36c0e8f..9a52186 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -39,8 +39,8 @@ <id>mysql</id> <properties> <db>mysql</db> - <db_user>om_db_admin</db_user> - <db_pass>12345</db_pass> + <db_user>root</db_user> + <db_pass></db_pass> </properties> <dependencies> <dependency> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java index f2bad46..a2ac827 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.openmeetings.core.remote.KurentoHandler; -import org.apache.openmeetings.core.remote.StreamProcessor; +import org.apache.openmeetings.core.remote.IKurentoHandler; +import org.apache.openmeetings.core.remote.IStreamProcessor; import org.apache.openmeetings.db.dao.user.IUserManager; import org.apache.openmeetings.db.entity.IDataProviderEntity; import org.apache.openmeetings.db.entity.basic.Client; @@ -57,9 +57,9 @@ public class ConnectionsPanel extends AdminBasePanel { @SpringBean private ClientManager cm; @SpringBean - private KurentoHandler kHandler; + private IKurentoHandler kHandler; @SpringBean - private StreamProcessor streamProcessor; + private IStreamProcessor streamProcessor; @SpringBean private IUserManager userManager; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java index 4521346..a0f30c1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java @@ -36,7 +36,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.openmeetings.core.remote.KurentoHandler; +import org.apache.openmeetings.core.remote.IKurentoHandler; import org.apache.openmeetings.db.dao.log.ConferenceLogDao; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.log.ConferenceLog; @@ -76,7 +76,7 @@ public class ClientManager implements IClientManager { @Autowired private Application app; @Autowired - private KurentoHandler kHandler; + private IKurentoHandler kHandler; @Autowired private TimerService timerService; diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java index 6829c0f..871e29d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java @@ -29,7 +29,7 @@ import java.util.function.Predicate; import javax.annotation.PostConstruct; -import org.apache.openmeetings.core.remote.KurentoHandler; +import org.apache.openmeetings.core.remote.IKurentoHandler; import org.apache.openmeetings.core.sip.SipManager; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.entity.basic.Client; @@ -57,7 +57,7 @@ public class TimerService { @Autowired private SipManager sipManager; @Autowired - private KurentoHandler kHandler; + private IKurentoHandler kHandler; @PostConstruct private void init() { diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java index 14dedea..b0e7d4a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java @@ -24,7 +24,7 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId; import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.openmeetings.core.remote.KurentoHandler; +import org.apache.openmeetings.core.remote.IKurentoHandler; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.basic.IWsClient; @@ -55,7 +55,7 @@ public abstract class OmWebSocketPanel extends Panel { public static final String CONNECTED_MSG = "socketConnected"; private final AtomicBoolean connected = new AtomicBoolean(); @SpringBean - private KurentoHandler kHandler; + private IKurentoHandler kHandler; private boolean pingable = false; protected OmWebSocketPanel(String id) { diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 2798914..3bfef5a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -37,8 +37,8 @@ import java.util.Map.Entry; import java.util.Set; import org.apache.commons.text.StringEscapeUtils; -import org.apache.openmeetings.core.remote.KurentoHandler; -import org.apache.openmeetings.core.remote.StreamProcessor; +import org.apache.openmeetings.core.remote.IKurentoHandler; +import org.apache.openmeetings.core.remote.IStreamProcessor; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.dao.file.FileItemDao; @@ -246,9 +246,9 @@ public class RoomPanel extends BasePanel { @SpringBean private QuickPollManager qpollManager; @SpringBean - private KurentoHandler kHandler; + private IKurentoHandler kHandler; @SpringBean - private StreamProcessor streamProcessor; + private IStreamProcessor streamProcessor; @SpringBean private TimerService timerService; @SpringBean diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index fced8f3..a554792 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -34,8 +34,8 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang3.time.FastDateFormat; -import org.apache.openmeetings.core.remote.KurentoHandler; -import org.apache.openmeetings.core.remote.StreamProcessor; +import org.apache.openmeetings.core.remote.IKurentoHandler; +import org.apache.openmeetings.core.remote.IStreamProcessor; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.dao.basic.ChatDao; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; @@ -112,9 +112,9 @@ public class RoomMenuPanel extends Panel { @SpringBean private ChatDao chatDao; @SpringBean - private KurentoHandler kHandler; + private IKurentoHandler kHandler; @SpringBean - private StreamProcessor streamProcessor; + private IStreamProcessor streamProcessor; public RoomMenuPanel(String id, final RoomPanel room) { super(id); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index a506b1a..110cb92 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.room.sidebar; import static org.apache.openmeetings.web.app.Application.kickUser; -import org.apache.openmeetings.core.remote.StreamProcessor; +import org.apache.openmeetings.core.remote.IStreamProcessor; import org.apache.openmeetings.core.util.WebSocketHelper; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.room.Room.Right; @@ -64,7 +64,7 @@ public class RoomSidebar extends Panel { @SpringBean private ClientManager cm; @SpringBean - private StreamProcessor streamProcessor; + private IStreamProcessor streamProcessor; public RoomSidebar(String id, final RoomPanel room) { super(id); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java index bdf55fc..7bf4a17 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.room.wb; import java.io.IOException; -import org.apache.openmeetings.core.remote.StreamProcessor; +import org.apache.openmeetings.core.remote.IStreamProcessor; import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.file.BaseFileItem; import org.apache.openmeetings.db.entity.room.Room.Right; @@ -33,7 +33,7 @@ import com.github.openjson.JSONObject; public class InterviewWbPanel extends AbstractWbPanel { private static final long serialVersionUID = 1L; @SpringBean - private StreamProcessor streamProcessor; + private IStreamProcessor streamProcessor; public InterviewWbPanel(String id, RoomPanel rp) { super(id, rp); diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml index 1c50a99..c9eb5e6 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml @@ -44,6 +44,10 @@ <aop:aspectj-autoproxy/> End annotation --> <context:component-scan base-package="org.apache.openmeetings" /> + + <!-- Kurento Handlers --> + <bean id="kHandler" class="org.apache.openmeetings.core.remote.KurentoHandler" /> + <bean id="streamProcessor" class="org.apache.openmeetings.core.remote.StreamProcessorr" /> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" p:location="classpath:openmeetings.properties" />
