You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/08/04 03:21:05 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1649] kms URL
is made configurable
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 50381ac [OPENMEETINGS-1649] kms URL is made configurable
50381ac is described below
commit 50381ac840d16d5eeeaee6fffb15f2ec00abd7d2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Aug 4 10:20:55 2018 +0700
[OPENMEETINGS-1649] kms URL is made configurable
---
.../openmeetings/core/remote/KurentoHandler.java | 18 ++++++++----------
.../main/webapp/WEB-INF/classes/applicationContext.xml | 5 +++++
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 5ca7a56..acb6898 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -22,9 +22,6 @@ package org.apache.openmeetings.core.remote;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.IWsClient;
@@ -36,14 +33,13 @@ import org.kurento.client.ObjectCreatedEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import com.github.openjson.JSONObject;
-@Component
public class KurentoHandler {
private final static Logger log = LoggerFactory.getLogger(KurentoHandler.class);
public final static String KURENTO_TYPE = "kurento";
+ private String kurentoWsUrl;
private KurentoClient client;
private final Map<Long, KRoom> rooms = new ConcurrentHashMap<>();
final Map<String, KUser> usersByUid = new ConcurrentHashMap<>();
@@ -52,11 +48,14 @@ public class KurentoHandler {
@Autowired
private IClientManager clientManager;
- @PostConstruct
- private void init() {
+ public void setKurentoWsUrl(String kurentoWsUrl) {
+ this.kurentoWsUrl = kurentoWsUrl;
+ }
+
+ public void init() {
try {
// TODO check connection, reconnect, listeners etc.
- client = KurentoClient.create();
+ client = KurentoClient.create(kurentoWsUrl);
client.getServerManager().addObjectCreatedListener(new EventListener<ObjectCreatedEvent>() {
@Override
public void onEvent(ObjectCreatedEvent evt) {
@@ -68,8 +67,7 @@ public class KurentoHandler {
}
}
- @PreDestroy
- private void destroy() {
+ public void destroy() {
if (client != null) {
client.destroy();
}
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 282a4c2..6110a5e 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -137,4 +137,9 @@
<property name="maxPoolSize" value="10" />
<property name="queueCapacity" value="25" />
</bean>
+
+ <!-- Kurento -->
+ <bean id="kurentoHandler" class="org.apache.openmeetings.core.remote.KurentoHandler" init-method="init" destroy-method="destroy">
+ <property name="kurentoWsUrl" value="ws://localhost:8888/kurento"/>
+ </bean>
</beans>