[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538880#comment-17538880 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit 7fb6ca2e9ea0379781d12f84b312771234bfd83e in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=7fb6ca2e9 ] [OPENMEETINGS-2733] some Sonar issues are addressed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
[openmeetings] 01/02: [OPENMEETINGS-2732] fabric.js
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
commit f659f1b14a265ebbd01d61795fa53dc00320252f
Author: Maxim Solodovnik
AuthorDate: Wed May 18 21:35:02 2022 +0700
[OPENMEETINGS-2732] fabric.js
---
openmeetings-web/src/main/front/wb/package.json | 2 +-
openmeetings-web/src/main/front/wb/src/wb.js| 7 ---
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/openmeetings-web/src/main/front/wb/package.json
b/openmeetings-web/src/main/front/wb/package.json
index b2ce35f75..e84874c63 100644
--- a/openmeetings-web/src/main/front/wb/package.json
+++ b/openmeetings-web/src/main/front/wb/package.json
@@ -18,7 +18,7 @@
"tinyify": "^3.0.0"
},
"dependencies": {
-"fabric": "^4.6.0",
+"fabric": "^5.2.1",
"mathjax-full": "^3.2.0"
}
}
diff --git a/openmeetings-web/src/main/front/wb/src/wb.js
b/openmeetings-web/src/main/front/wb/src/wb.js
index f979e328d..adbff2fe6 100644
--- a/openmeetings-web/src/main/front/wb/src/wb.js
+++ b/openmeetings-web/src/main/front/wb/src/wb.js
@@ -84,10 +84,6 @@ module.exports = class Wb {
}
function _createObject(arr, handler) {
fabric.util.enlivenObjects(arr, function(objects) {
- self.eachCanvas(function(canvas) {
- canvas.renderOnAddRemove = false;
- });
-
for (let i = 0; i < objects.length; ++i) {
const _o = objects[i];
_o.loaded = true;
@@ -95,7 +91,6 @@ module.exports = class Wb {
}
self.eachCanvas(function(canvas) {
- canvas.renderOnAddRemove = true;
canvas.requestRenderAll();
});
});
@@ -473,14 +468,12 @@ module.exports = class Wb {
this.clearSlide = (_sl) => {
if (canvases.length > _sl) {
const canvas = canvases[_sl];
- canvas.renderOnAddRemove = false;
let arr = canvas.getObjects();
while (arr.length > 0) {
canvas.remove(arr[arr.length - 1]);
arr = canvas.getObjects();
}
$('.room-block .wb-block .wb-video.slide-' +
_sl).remove();
- canvas.renderOnAddRemove = true;
canvas.requestRenderAll();
}
};
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538879#comment-17538879 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit f659f1b14a265ebbd01d61795fa53dc00320252f in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=f659f1b14 ] [OPENMEETINGS-2732] fabric.js > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.7#820007)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538958#comment-17538958 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit e6adbd15294a328c75f5bf477f62f1c8fe646260 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e6adbd152 ] [OPENMEETINGS-2733] more Sonar issues are fixed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
[openmeetings] branch master updated: [OPENMEETINGS-2733] more Sonar issues are 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 e6adbd152 [OPENMEETINGS-2733] more Sonar issues are fixed
e6adbd152 is described below
commit e6adbd15294a328c75f5bf477f62f1c8fe646260
Author: Maxim Solodovnik
AuthorDate: Wed May 18 23:47:29 2022 +0700
[OPENMEETINGS-2733] more Sonar issues are fixed
---
.../src/main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../main/java/org/apache/openmeetings/web/util/OmUrlFragment.java | 6 +++---
.../src/test/java/org/apache/openmeetings/web/TestMainAreas.java| 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index bf83b3ed2..9c590c7cf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -423,7 +423,7 @@ public class MainPanel extends Panel {
}
if (updateFragment) {
UrlFragment uf = new UrlFragment(handler);
- uf.set(f.getArea().area(), f.getType());
+ uf.set(f.getArea().zone(), f.getType());
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 0438b7067..6e4890f33 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -104,7 +104,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
for (AreaKeys key : AreaKeys.values()) {
- StringValue type = params.getParameterValue(key.area());
+ StringValue type = params.getParameterValue(key.zone());
if (!type.isEmpty()) {
return new OmUrlFragment(key, type.toString());
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
index f7bcf4946..02f8ff709 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
@@ -94,7 +94,7 @@ public class OmUrlFragment implements Serializable {
, ROOM
, ROOMS;
- public String area() {
+ public String zone() {
return name().toLowerCase(Locale.ROOT);
}
@@ -230,7 +230,7 @@ public class OmUrlFragment implements Serializable {
String[] arr =
Application.get().getBean(ConfigurationDao.class).getString(CONFIG_DEFAULT_LANDING_ZONE,
"").split("/");
if (arr != null && arr.length == 2) {
try {
- return new
OmUrlFragment(AreaKeys.valueOf(arr[0]), arr[1]);
+ return new OmUrlFragment(AreaKeys.of(arr[0]),
arr[1]);
} catch (Exception e) {
// no-op
}
@@ -333,7 +333,7 @@ public class OmUrlFragment implements Serializable {
}
public String getLink() {
- return getBaseUrl() + "#" + getArea().area() + "/" + getType();
+ return getBaseUrl() + "#" + getArea().zone() + "/" + getType();
}
private static void moveToServer(Room r) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
index 128d2ec42..09855380c 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
@@ -91,7 +91,7 @@ class TestMainAreas extends AbstractWicketTesterTest {
for (String user : users) {
log.debug("Positive test:: area: {}, type: {} for user:
{}", area, type, user);
testArea(user, p -> {
- tester.getRequest().setParameter(area.name(),
type);
+
[openmeetings] branch master updated: [OPENMEETINGS-2734] start script updated
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 99a0a318e [OPENMEETINGS-2734] start script updated 99a0a318e is described below commit 99a0a318e7fdd2c1cd62de0fa4438f1ad4e05cd7 Author: Maxim Solodovnik AuthorDate: Wed May 18 20:51:59 2022 +0700 [OPENMEETINGS-2734] start script updated --- openmeetings-server/src/main/assembly/scripts/openmeetings.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmeetings-server/src/main/assembly/scripts/openmeetings.service b/openmeetings-server/src/main/assembly/scripts/openmeetings.service index d7758a6d4..6dc77bf5e 100644 --- a/openmeetings-server/src/main/assembly/scripts/openmeetings.service +++ b/openmeetings-server/src/main/assembly/scripts/openmeetings.service @@ -23,7 +23,7 @@ After=network.target [Service] Type=forking -Environment=JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +Environment=JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 Environment=CATALINA_PID=/var/run/openmeetings.pid WorkingDirectory=/opt/openmeetings Environment=CATALINA_HOME=/opt/openmeetings
[jira] [Commented] (OPENMEETINGS-2734) OM should be migrated to java17
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2734?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538848#comment-17538848
]
ASF subversion and git services commented on OPENMEETINGS-2734:
---
Commit 99a0a318e7fdd2c1cd62de0fa4438f1ad4e05cd7 in openmeetings's branch
refs/heads/master from Maxim Solodovnik
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=99a0a318e ]
[OPENMEETINGS-2734] start script updated
> OM should be migrated to java17
> ---
>
> Key: OPENMEETINGS-2734
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2734
> Project: Openmeetings
> Issue Type: Improvement
> Components: Builds
>Affects Versions: 7.0.0
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 7.0.0
>
>
> Minimum java version for project should be updated to Java17
> additional steps required:
> - Hebrew (_iw) should be renamed to {{_he}}
> - indonesian(_in) should be renamed to {{_id}}
> -
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538907#comment-17538907 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit eff2d74083f9971557992d2c5e37eb706a2369ce in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=eff2d7408 ] [OPENMEETINGS-2733] some Sonar issues are addressed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
[openmeetings] branch master updated (410a30917 -> 7fb6ca2e9)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git from 410a30917 [OPENMEETINGS-2733] some Sonar issues are addressed new f659f1b14 [OPENMEETINGS-2732] fabric.js new 7fb6ca2e9 [OPENMEETINGS-2733] some Sonar issues are addressed The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 9 + openmeetings-web/src/main/front/wb/package.json | 2 +- openmeetings-web/src/main/front/wb/src/wb.js | 7 --- .../main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +- .../main/java/org/apache/openmeetings/web/pages/BasePage.java| 2 +- .../java/org/apache/openmeetings/web/util/OmUrlFragment.java | 1 + 6 files changed, 9 insertions(+), 14 deletions(-)
[openmeetings] 02/02: [OPENMEETINGS-2733] some Sonar issues are addressed
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
commit 7fb6ca2e9ea0379781d12f84b312771234bfd83e
Author: Maxim Solodovnik
AuthorDate: Wed May 18 21:35:45 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 9 +
.../main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +-
.../main/java/org/apache/openmeetings/web/pages/BasePage.java| 2 +-
.../java/org/apache/openmeetings/web/util/OmUrlFragment.java | 1 +
4 files changed, 8 insertions(+), 6 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 ab8b144b5..3c3d1300e 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
@@ -509,13 +509,14 @@ public class KurentoHandler {
@Override
public void onEvent(ObjectCreatedEvent evt) {
- log.debug("Kurento::ObjectCreated -> {}, source {}",
evt.getObject(), evt.getSource());
- if (evt.getObject() instanceof MediaPipeline) {
+ MediaObject obj = evt.getObject();
+ log.debug("Kurento::ObjectCreated -> {}, source {}",
obj, evt.getSource());
+ if (obj instanceof MediaPipeline) {
// room created
- final String roid = evt.getObject().getId();
+ final String roid = obj.getId();
checkPipeline(roid);
- } else if (evt.getObject() instanceof Endpoint
curPoint) {
+ } else if (obj instanceof Endpoint curPoint) {
// endpoint created
final String eoid = curPoint.getId();
final Class clazz =
getEndpointClass(curPoint);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index ca2132bd2..bf83b3ed2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -423,7 +423,7 @@ public class MainPanel extends Panel {
}
if (updateFragment) {
UrlFragment uf = new UrlFragment(handler);
- uf.set(f.getArea().name(), f.getType());
+ uf.set(f.getArea().area(), f.getType());
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 92350d31e..0438b7067 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -104,7 +104,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
protected OmUrlFragment getUrlFragment(IRequestParameters params) {
for (AreaKeys key : AreaKeys.values()) {
- StringValue type = params.getParameterValue(key.name());
+ StringValue type = params.getParameterValue(key.area());
if (!type.isEmpty()) {
return new OmUrlFragment(key, type.toString());
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
index 4d89c4841..f7bcf4946 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java
@@ -97,6 +97,7 @@ public class OmUrlFragment implements Serializable {
public String area() {
return name().toLowerCase(Locale.ROOT);
}
+
public static AreaKeys of(String val) {
return val == null ? null :
AreaKeys.valueOf(val.toUpperCase(Locale.ROOT));
}
[jira] [Commented] (OPENMEETINGS-2737) Incomplete Address when dialing OM Conference room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2737?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538822#comment-17538822
]
Horace Miles commented on OPENMEETINGS-2737:
Thanks Maxim,
I am doing a deep dive on SIP this week as I have time. I understand busy and
having a family. I will let you know as soon as I finish the deep dive on SIP.
> Incomplete Address when dialing OM Conference room
> --
>
> Key: OPENMEETINGS-2737
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2737
> Project: Openmeetings
> Issue Type: Bug
> Components: VoIP/SIP
>Affects Versions: 6.2.0
>Reporter: Horace Miles
>Assignee: Maxim Solodovnik
>Priority: Major
>
> When trying to call OM conference room I receive the following error:
> SIP/2.0 484 Address Incomplete
> *CLI> pjsip show history
> No. Timestamp (Dir) Address SIP Message
>
> = == ==
> ===
> 0 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 1 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 401 Unauthorized
> 2 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> 3 1652464465 * <== 98.174.244.227:41916 INVITE
> sip:40011@98.174.244.232 SIP/2.0
> 4 1652464465 * ==> 98.174.244.227:41916 SIP/2.0 484 Address Incomplete
> 5 1652464465 * <== 98.174.244.227:41916 ACK sip:40011@98.174.244.232
> SIP/2.0
> *CLI>
> sip.conf settings
> [omsip_user]
> host=dynamic
> secret=
> context=rooms-omsip
> transport=ws,wss
> type=friend
> encryption=no
> avpf=yes
> icesupport=yes
> directmedia=no
> allow=!all,ulaw,opus,vp8
> extensions.conf configuration
> [rooms]
> exten =>
> _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
> exten => _400X!,n(ok),SET(PIN=${DB(openmeetings/rooms/${EXTEN})})
> exten => _400X!,n,Set(CONFBRIDGE(user,template)=sip_user)
> exten => _400X!,n,Set(CONFBRIDGE(user,pin)=${PIN})
> exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,)
> exten => _400X!,n,Hangup
> exten => _400X!,n(notavail),Answer()
> exten => _400X!,n,Playback(invalid)
> exten => _400X!,n,Hangup
> [rooms-originate]
> exten => _400X!,1,Confbridge(${EXTEN},default_bridge,sip_user)
> exten => _400X!,n,Hangup
> [rooms-out]
> ; *
> ; Extensions for outgoing calls from Openmeetings room.
> ; *
> [rooms-omsip]
> exten =>
> _400X!,1,GotoIf($[${DB_EXISTS(openmeetings/rooms/${EXTEN})}]?ok:notavail)
> exten => _400X!,n(ok),Confbridge(${EXTEN},default_bridge,omsip_user)
> exten => _400X!,n(notavail),Hangup
> Asterisk Database
> CLI> database show
> /dundi/secret :
> fL3QQ8egcjnj1bEufyh+AQ==;W6fVbQ9sJWPq0oZp50y7Ig==
> /dundi/secretexpiry : 1652465880
> /openmeetings/rooms : 4004
> /openmeetings/rooms/40011 :
> /pbx/UUID :
> 7dd6882b-8da9-4099-a6a7-3012970c94ca
> /registrar/contact/horace-cellphone;@de16880426ac7644569b396c5df408ff:
> {"via_addr":"10.10.0.8","qualify_timeout":"3.00","call_id":"GM3y5EhhVO","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-cellphone","via_port":"41916","authenticate_qualify":"no","uri":"sip:horace-cellphone@98.174.244.227:41916;transport=udp","qualify_frequency":"0","user_agent":"LinphoneAndroid/4.6.7
> (Galaxy Note9) LinphoneSDK/5.1.28
> (tags/5.1.28^0)","expiration_time":"1652465692","outbound_proxy":""}
> /registrar/contact/horace-desktop;@2487af86a629ea26178ed30c7963b8f8:
> {"via_addr":"10.10.0.2","qualify_timeout":"3.00","call_id":"2LzZJqpTs1","reg_server":"","prune_on_boot":"no","path":"","endpoint":"horace-desktop","via_port":"5060","authenticate_qualify":"no","uri":"sip:horace-desktop@98.174.244.227;transport=udp","qualify_frequency":"0","user_agent":"Linphone
> Desktop/4.4.1 (MILES-PC) Windows 10 Version 2009, Qt 5.15.2
> LinphoneCore/5.1.19-1-g6cdd0918e","expiration_time":"1652466228","outbound_proxy":""}
> 7 results found.
> *CLI>
> I am using linphone 4.4.1 - Qt5.15.2
> Asterisk 16
> I can successfully make calls from Asterisk extension inbound and output to
> both internal extentions and external PTSN numbers.
> I can not dial out of a OM Conference room - I get nothing at all
> I can not dial into a open meetings
> I can not dial between conference rooms
> I have also tried to create AOR, Auth and Endpoint records for a conference
> room as follows:
> [40011]
> type=endpoint
> context=rooms-omsip
> disallow=all
>
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538846#comment-17538846 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit ad17624596ae060490e6fd083483770d20c85e6d in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=ad1762459 ] [OPENMEETINGS-2733] some Sonar issues are addressed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
[openmeetings] branch master updated: [OPENMEETINGS-2733] some Sonar issues are addressed
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 eff2d7408 [OPENMEETINGS-2733] some Sonar issues are addressed
eff2d7408 is described below
commit eff2d74083f9971557992d2c5e37eb706a2369ce
Author: Maxim Solodovnik
AuthorDate: Wed May 18 22:18:25 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../org/apache/openmeetings/TestConnection.java| 29 --
.../openmeetings/core/remote/BaseMockedTest.java | 16 +++-
.../core/remote/TestNotConnectedMocked.java| 28 -
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
deleted file mode 100644
index b3174f117..0
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings;
-
-import org.junit.jupiter.api.Test;
-
-class TestConnection {
-
- @Test
- void testNoop() {
- //no-op
- }
-}
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
index ff8549d3a..a19a3ca6d 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java
@@ -97,6 +97,15 @@ public class BaseMockedTest {
handler.init();
}
+ void mockWs(MockedStatic wsHelperMock) {
+ wsHelperMock.when(() ->
WebSocketHelper.sendClient(any(IWsClient.class),
any(JSONObject.class))).thenAnswer(new Answer() {
+ @Override
+ public Void answer(InvocationOnMock invocation) throws
Throwable {
+ return null;
+ }
+ });
+ }
+
void runWrapped(Runnable task) {
try (MockedStatic streamMock =
mockStatic(AbstractStream.class);
MockedStatic wsHelperMock =
mockStatic(WebSocketHelper.class);
@@ -108,12 +117,7 @@ public class BaseMockedTest {
Set mocks = newMockSafeHashSet();
new MockScanner(this,
BaseMockedTest.class).addPreparedMocks(mocks);
new MockScanner(this,
this.getClass()).addPreparedMocks(mocks);
- wsHelperMock.when(() ->
WebSocketHelper.sendClient(any(IWsClient.class),
any(JSONObject.class))).thenAnswer(new Answer() {
- @Override
- public Void answer(InvocationOnMock invocation)
throws Throwable {
- return null;
- }
- });
+ mockWs(wsHelperMock);
streamMock.when(() ->
AbstractStream.createWebRtcEndpoint(any(MediaPipeline.class), anyBoolean(),
any())).thenReturn(mock(WebRtcEndpoint.class));
streamMock.when(() ->
AbstractStream.createRecorderEndpoint(any(MediaPipeline.class), anyString(),
any(MediaProfileSpecType.class))).thenReturn(mock(RecorderEndpoint.class));
streamMock.when(() ->
AbstractStream.createPlayerEndpoint(any(MediaPipeline.class),
anyString())).thenReturn(mock(PlayerEndpoint.class));
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
index 7f5f3c77f..e0eba9350 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
+++
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538857#comment-17538857 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit 410a30917ac19e6dbdae21456088cdf2f22e4d19 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=410a30917 ] [OPENMEETINGS-2733] some Sonar issues are addressed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
[openmeetings] branch master updated: [OPENMEETINGS-2733] some Sonar issues are addressed
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 410a30917 [OPENMEETINGS-2733] some Sonar issues are addressed
410a30917 is described below
commit 410a30917ac19e6dbdae21456088cdf2f22e4d19
Author: Maxim Solodovnik
AuthorDate: Wed May 18 20:57:24 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../main/java/org/apache/openmeetings/core/converter/BaseConverter.java | 2 +-
.../main/java/org/apache/openmeetings/core/remote/KurentoHandler.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 582d1b2f5..e62d3b1b5 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -179,7 +179,7 @@ public abstract class BaseConverter {
}
protected RecordingChunk waitForTheStream(long chunkId) {
- RecordingChunk chunk;
+ RecordingChunk chunk = null;
try {
long counter = 0;
long maxTimestamp = 0;
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 f1d62de9c..ab8b144b5 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
@@ -483,7 +483,7 @@ public class KurentoHandler {
return;
}
// still alive
- Endpoint point = client.getById(eoid, clazz);
+ Endpoint point = client.getById(endpointOid,
clazz);
Map tags = tagsAsMap(point);
try {
Map pipeTags =
tagsAsMap(point.getMediaPipeline());
[openmeetings] branch master updated: [OPENMEETINGS-2733] some Sonar issues are addressed
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 ad1762459 [OPENMEETINGS-2733] some Sonar issues are addressed
ad1762459 is described below
commit ad17624596ae060490e6fd083483770d20c85e6d
Author: Maxim Solodovnik
AuthorDate: Wed May 18 20:50:07 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../openmeetings/core/converter/BaseConverter.java | 57 ++---
.../core/converter/InterviewConverter.java | 99
.../openmeetings/core/ldap/LdapLoginManager.java | 277 +++--
.../openmeetings/core/remote/KurentoHandler.java | 156 ++--
.../openmeetings/core/remote/StreamProcessor.java | 61 +++--
.../apache/openmeetings/web/app/Application.java | 10 +-
.../web/common/tree/FileTreePanel.java | 3 +-
.../openmeetings/web/common/tree/FolderPanel.java | 11 +-
.../apache/openmeetings/web/room/RoomPanel.java| 2 +-
.../web/room/activities/ActivitiesPanel.java | 6 +
.../web/user/calendar/CalendarDialog.java | 4 +
11 files changed, 369 insertions(+), 317 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
index 736cc1163..582d1b2f5 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
@@ -179,39 +179,34 @@ public abstract class BaseConverter {
}
protected RecordingChunk waitForTheStream(long chunkId) {
- RecordingChunk chunk = chunkDao.get(chunkId);
+ RecordingChunk chunk;
try {
- if (chunk.getStreamStatus() != Status.STOPPED) {
- log.debug("### Chunk Stream not yet written to
disk {}", chunkId);
- long counter = 0;
- long maxTimestamp = 0;
- while (true) {
- log.trace("### Stream not yet written
Thread Sleep - {}", chunkId);
-
- chunk = chunkDao.get(chunkId);
-
- if (chunk.getStreamStatus() ==
Status.STOPPED) {
- printChunkInfo(chunk, "Stream
now written");
- log.debug("### Thread continue
... " );
- break;
- } else {
- File chunkFlv =
getRecordingChunk(chunk.getRecording().getRoomId(), chunk.getStreamName());
- if (chunkFlv.exists() &&
maxTimestamp < chunkFlv.lastModified()) {
- maxTimestamp =
chunkFlv.lastModified();
- }
- if (maxTimestamp +
TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) {
- log.debug("### long
time without any update, closing ... ");
-
chunk.setStreamStatus(Status.STOPPED);
- chunkDao.update(chunk);
- break;
- }
- }
- if (++counter % 1000 == 0) {
- printChunkInfo(chunk, "Still
waiting");
- }
-
- Thread.sleep(100L);
+ long counter = 0;
+ long maxTimestamp = 0;
+ while (true) {
+ chunk = chunkDao.get(chunkId);
+
+ if (chunk.getStreamStatus() == Status.STOPPED) {
+ printChunkInfo(chunk, "Stream now
written");
+ log.debug("### Chunk stopped,
unblocking thread ... " );
+ break;
+ }
+ File chunkFlv =
getRecordingChunk(chunk.getRecording().getRoomId(), chunk.getStreamName());
+ if (chunkFlv.exists() && maxTimestamp <
chunkFlv.lastModified()) {
+ maxTimestamp = chunkFlv.lastModified();
}
+
[openmeetings] branch master updated: [OPENMEETINGS-2733] some Sonar issues are addressed
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 694d0bb31 [OPENMEETINGS-2733] some Sonar issues are addressed
694d0bb31 is described below
commit 694d0bb31f8bb260be2542819c319b6bd8537208
Author: Maxim Solodovnik
AuthorDate: Wed May 18 15:15:03 2022 +0700
[OPENMEETINGS-2733] some Sonar issues are addressed
---
.../apache/openmeetings/core/remote/KStream.java | 4 +-
.../openmeetings/core/remote/KurentoHandler.java | 3 +-
.../core/util/ChatWebSocketHelper.java | 17 ++--
.../openmeetings/core/util/WebSocketHelper.java| 27 +++
.../db/dao/basic/ConfigurationDao.java | 22 ++
.../openmeetings/db/dao/file/FileItemDao.java | 6 +-
.../openmeetings/db/dao/record/RecordingDao.java | 2 +-
.../apache/openmeetings/db/dto/user/OAuthUser.java | 6 +-
.../openmeetings/db/entity/basic/Client.java | 6 +-
.../openmeetings/db/entity/file/BaseFileItem.java | 3 +-
.../apache/openmeetings/db/mapper/RoomMapper.java | 3 +-
.../openmeetings/backup/converter/WbConverter.java | 16 ++--
.../calendar/caldav/AppointmentManager.java| 21 ++---
.../service/room/InvitationManager.java| 3 +-
.../web/admin/connection/ConnectionsPanel.java | 6 +-
.../apache/openmeetings/web/app/Application.java | 3 +-
.../apache/openmeetings/web/common/MainPanel.java | 4 +-
.../common/datetime/AbstractOmDateTimePicker.java | 8 +-
.../openmeetings/web/common/tree/FolderPanel.java | 23 +++---
.../web/common/tree/OmTreeProvider.java| 3 +-
.../web/pages/auth/ForgetPasswordDialog.java | 24 +++---
.../web/pages/auth/RegisterDialog.java | 4 +-
.../apache/openmeetings/web/room/RoomPanel.java| 32
.../web/room/activities/ActivitiesPanel.java | 86 ++---
.../openmeetings/web/room/activities/Activity.java | 22 +++---
.../web/room/menu/RoomInvitationForm.java | 18 ++---
.../openmeetings/web/room/wb/UndoObject.java | 6 +-
.../apache/openmeetings/web/room/wb/WbPanel.java | 19 +++--
.../web/room/wb/WbWebSocketHelper.java | 18 ++---
.../web/user/calendar/AppointmentDialog.java | 16 ++--
.../web/user/calendar/CalendarDialog.java | 67
.../web/user/profile/MessagesContactsPanel.java| 2 +
.../web/user/record/RecordingsPanel.java | 6 +-
.../openmeetings/web/user/record/VideoInfo.java| 3 +-
.../web/user/rooms/RoomEnterBehavior.java | 2 +-
.../openmeetings/web/util/OmUrlFragment.java | 90 --
.../openmeetings/AbstractWicketTesterTest.java | 2 +-
.../apache/openmeetings/backup/TestImportUser.java | 5 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 66
.../webservice/AbstractWebServiceTest.java | 2 +-
.../openmeetings/webservice/UserWebService.java| 4 +-
.../util/AppointmentListMessageBodyWriter.java | 3 +-
42 files changed, 319 insertions(+), 364 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index c74b3483c..52462c8eb 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -259,9 +259,9 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
final BaseRtpEndpoint endpoint = getEndpointForUser(sid, uid);
final String sdpAnswer = endpoint.processOffer(sdpOffer);
- if (endpoint instanceof WebRtcEndpoint) {
+ if (endpoint instanceof WebRtcEndpoint rtcEndpoint) {
log.debug("gather candidates, sid {}, uid {}", sid,
uid);
- ((WebRtcEndpoint)endpoint).gatherCandidates(); // this
one might throw Exception
+ rtcEndpoint.gatherCandidates(); // this one might throw
Exception
}
log.trace("USER {}: SdpAnswer is {}", this.uid, sdpAnswer);
kHandler.sendClient(sid, newKurentoMsg()
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 22c942fdc..aa4d6af87 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
@@ -466,9 +466,8 @@ public class KurentoHandler {
log.warn("Invalid MediaPipeline {}
detected, will be dropped, tags: {}",
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17538651#comment-17538651 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit 694d0bb31f8bb260be2542819c319b6bd8537208 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=694d0bb31 ] [OPENMEETINGS-2733] some Sonar issues are addressed > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.7#820007)
