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 2020/10/22 09:17:34 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2239] tests
should be fixed
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 c9b3cb9 [OPENMEETINGS-2239] tests should be fixed
c9b3cb9 is described below
commit c9b3cb9b6a9baf981cb5eeb8e05b98fa498ae4da
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Oct 22 16:17:16 2020 +0700
[OPENMEETINGS-2239] tests should be fixed
---
.../apache/openmeetings/core/sip/SipManager.java | 3 ++-
.../webapp/WEB-INF/classes/openmeetings.properties | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 5ffa17a..4e0f991 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -60,6 +60,7 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.manager.ISipManager;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.wicket.util.string.Strings;
import org.asteriskjava.manager.DefaultManagerConnection;
import org.asteriskjava.manager.ManagerConnection;
import org.asteriskjava.manager.ManagerConnectionFactory;
@@ -138,7 +139,7 @@ public class SipManager implements ISipManager, SipListenerExt {
@PostConstruct
public void init() throws Exception {
- if (sipHostname != null) {
+ if (!Strings.isEmpty(sipHostname)) {
factory = new ManagerConnectionFactory(
sipHostname
, managerPort
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
index 5f566d8..7b966e1 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
@@ -50,16 +50,16 @@ kurento.kuid=df992960-e7b0-11ea-9acd-337fb30dd93d
kurento.ignored.kuids=
################## SIP ##################
-### Should be uncommented and updated with real values for Asterisk ###
-#sip.hostname=192.168.1.102
-#sip.manager.port=5038
-#sip.manager.user=openmeetings
-#sip.manager.password=12345
-#sip.manager.timeout=10000
+### Should be updated with real values for Asterisk ###
+sip.hostname=
+sip.manager.port=5038
+sip.manager.user=openmeetings
+sip.manager.password=12345
+sip.manager.timeout=10000
-#sip.ws.local.port=6666
+sip.ws.local.port=6666
## 127.0.0.1 is NOT working here
-#sip.ws.local.host=192.168.1.211
-#sip.ws.remote.port=8088
-#sip.ws.remote.user=omsip_user
-#sip.ws.remote.password=12345
+sip.ws.local.host=
+sip.ws.remote.port=8088
+sip.ws.remote.user=omsip_user
+sip.ws.remote.password=12345