[openmeetings] 02/02: no jira: better debug of KMS re-connection

2020-11-25 Thread solomax
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 588831b54f9527c785336748729219b3190dc365
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 25 20:45:53 2020 +0700

no jira: better debug of KMS re-connection
---
 .../main/java/org/apache/openmeetings/core/remote/KurentoHandler.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a0cd23b..ac4fab6 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
@@ -190,7 +190,7 @@ public class KurentoHandler {
} catch (Exception e) {
connected.set(false);
clean();
-   log.warn("Fail to create Kurento client, will 
re-try in {} ms", checkTimeout);
+   log.warn("Fail to create Kurento client, will 
re-try in {} ms", checkTimeout, e);
}
};
kmsRecheckScheduler.scheduleAtFixedRate(check, 0L, 
checkTimeout, MILLISECONDS);
@@ -208,7 +208,7 @@ public class KurentoHandler {
KurentoClient copy = client;
client = null;
if (!copy.isClosed()) {
-   log.debug("Client will destroyed ...");
+   log.debug("Client will be destroyed 
...");
copy.destroy();
log.debug(" Client is destroyed");
}



[openmeetings] branch master updated (96dd92a -> 588831b)

2020-11-25 Thread solomax
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 96dd92a  no jira: no-cluster config is fixed
 new 0d63d6a  no jira: no-cluster config is fixed
 new 588831b  no jira: better debug of KMS re-connection

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:
 .../main/java/org/apache/openmeetings/core/remote/KurentoHandler.java | 4 ++--
 openmeetings-server/src/site/xdoc/Clustering.xml  | 1 +
 openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml| 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)



[openmeetings] 01/02: no jira: no-cluster config is fixed

2020-11-25 Thread solomax
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 0d63d6a70cec1a53f8339aa0451eb56b2f63beac
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 25 18:54:59 2020 +0700

no jira: no-cluster config is fixed
---
 openmeetings-server/src/site/xdoc/Clustering.xml   | 1 +
 openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml 
b/openmeetings-server/src/site/xdoc/Clustering.xml
index a914f9c..55b6e33 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -121,6 +121,7 @@


[openmeetings] branch master updated: no jira: no-cluster config is fixed

2020-11-25 Thread solomax
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 96dd92a  no jira: no-cluster config is fixed
96dd92a is described below

commit 96dd92ab30ff0d7c641517256b9210d0e32ff3fc
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 25 17:05:00 2020 +0700

no jira: no-cluster config is fixed
---
 openmeetings-server/src/site/xdoc/Clustering.xml   | 5 -
 openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/Clustering.xml 
b/openmeetings-server/src/site/xdoc/Clustering.xml
index 604fdb4..a914f9c 100644
--- a/openmeetings-server/src/site/xdoc/Clustering.xml
+++ b/openmeetings-server/src/site/xdoc/Clustering.xml
@@ -117,7 +117,7 @@
Set 
instance-name for each server to unique value
Set 
server.url for each server to full public URL of this 
server (please NOTE using of numeric IP address might broke HTTPS))

-   Comment 
out/delete following block:
+   Comment 
out/delete following blocks:


+   



Un-comment 
following block (ensure it contains valip parameters):
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml 
b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index a6739ec..517b841 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
 http://www.w3.org/2001/XMLSchema-instance;
xmlns="http://www.hazelcast.com/schema/config;
-   xsi:schemaLocation="http://www.hazelcast.com/schema/config 
http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd;
+   xsi:schemaLocation="http://www.hazelcast.com/schema/config 
http://www.hazelcast.com/schema/config/hazelcast-config-4.1.xsd;
>


@@ -99,5 +99,6 @@


slf4j
+   false

 



[openmeetings] branch master updated: no jira: minor layout issue

2020-11-24 Thread solomax
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 00d36f8  no jira: minor layout issue
00d36f8 is described below

commit 00d36f8ad626595402db4079519347ab6aef5a4e
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 25 11:07:48 2020 +0700

no jira: minor layout issue
---
 .../main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html| 2 +-
 openmeetings-web/src/main/webapp/css/raw-admin.css | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
index 4a03e3c..d369035 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminBasePanel.html
@@ -21,7 +21,7 @@
 
 http://wicket.apache.org;>
 
-   
+   


 
diff --git a/openmeetings-web/src/main/webapp/css/raw-admin.css 
b/openmeetings-web/src/main/webapp/css/raw-admin.css
index f6bf89c..867d0f1 100644
--- a/openmeetings-web/src/main/webapp/css/raw-admin.css
+++ b/openmeetings-web/src/main/webapp/css/raw-admin.css
@@ -46,8 +46,7 @@
overflow-y: auto;
 }
 .adminForm legend, .installer legend {
-   padding: 0.2em 0.5em;
-   margin: 0px 10px;
+   padding: 0.5em 1em;
font-style: italic;
text-align: right;
 }



[openmeetings] branch master updated: no jira: raw files are removed from packaging, console log is conditionally added

2020-11-24 Thread solomax
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 a5274d2  no jira: raw files are removed from packaging, console log is 
conditionally added
a5274d2 is described below

commit a5274d2230f170e5031642949ff638adf983dd61
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 25 09:12:23 2020 +0700

no jira: raw files are removed from packaging, console log is conditionally 
added
---
 openmeetings-server/pom.xml  |  1 +
 openmeetings-server/src/main/assembly/components/all.xml |  4 ++--
 openmeetings-web/pom.xml | 16 
 .../src/main/webapp/WEB-INF/classes/logback-config.xml   |  2 +-
 pom.xml  |  2 ++
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 53737de..150c999 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -112,6 +112,7 @@
server

unpacked
true
+   



diff --git a/openmeetings-server/src/main/assembly/components/all.xml 
b/openmeetings-server/src/main/assembly/components/all.xml
index 0319739..3dfbf32 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -107,7 +107,7 @@

${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}
${om.webapp}

-   WEB-INF/classes/META-INF/**
+   WEB-INF/classes/**



@@ -115,7 +115,7 @@
${om.webapp}
true

-   WEB-INF/classes/META-INF/**
+   WEB-INF/classes/**



diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 97b3823..1706ace 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -283,8 +283,7 @@
**/fileinput.css,
**/adapter-latest.js,
**/kurento-utils.js,
-   **/NoSleep.js,
-   **/network.js
+   **/NoSleep.js


**/raw-*.css,
@@ -295,8 +294,7 @@
**/fileinput.css,
**/adapter-latest.js,
**/kurento-utils.js,
-   **/NoSleep.js,
-   **/network.js
+   **/NoSleep.js


true

@@ -310,6 +308,16 @@

**/*.xml

**/*.properties

+   
+   
**/raw-*.js
+   
**/fabric.js
+   
**/MathJax*.js
+   
**/fileinput.js
+   
**/fileinput.css
+   
**/adapter-latest.js
+   
**/kurento-utils.js
+   
**/NoSleep.js
+   



${project.parent.basedir}/openmeetings-service/src/main/java
diff --git 
a/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml 
b/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
index 54b64e2..87b35a0 100644
--- a/openmeetings-web/src/main/webapp

[openmeetings] branch master updated: [OPENMEETINGS-2523] refresh of audio/video seems to work

2020-11-23 Thread solomax
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 87fed22  [OPENMEETINGS-2523] refresh of audio/video seems to work
87fed22 is described below

commit 87fed22bbd2f8d900eb618affaa8cffe4afaefcb
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 23 20:37:52 2020 +0700

[OPENMEETINGS-2523] refresh of audio/video seems to work
---
 .../apache/openmeetings/core/remote/KStream.java   | 25 --
 .../openmeetings/core/remote/StreamProcessor.java  | 13 +++
 .../apache/openmeetings/web/room/raw-settings.js   |  4 ++--
 .../openmeetings/web/room/raw-video-manager.js |  5 -
 .../org/apache/openmeetings/web/room/raw-video.js  | 18 
 5 files changed, 52 insertions(+), 13 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 650ecbe..d744c18 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
@@ -53,6 +53,7 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
 import org.apache.openmeetings.db.util.ws.TextRoomMessage;
 import org.kurento.client.Continuation;
 import org.kurento.client.IceCandidate;
+import org.kurento.client.ListenerSubscription;
 import org.kurento.client.MediaFlowState;
 import org.kurento.client.MediaObject;
 import org.kurento.client.MediaPipeline;
@@ -82,6 +83,7 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
private Optional sipProcessor;
private final ConcurrentMap listeners = new 
ConcurrentHashMap<>();
private Optional> flowoutFuture = 
Optional.empty();
+   private ListenerSubscription flowoutSubscription;
private Long chunkId;
private Type type;
private String sdpOffer;
@@ -154,7 +156,7 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
this.sdpOffer = sdpOffer;
outgoingMedia = createEndpoint(sd.getSid(), sd.getUid());
outgoingMedia.addMediaSessionTerminatedListener(evt -> 
log.warn("Media stream terminated {}", sd));
-   outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
+   flowoutSubscription = 
outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
log.info("Media Flow STATE :: {}, type {}, evt {}", 
evt.getState(), evt.getType(), evt.getMediaType());
if (MediaFlowState.NOT_FLOWING == evt.getState()) {
log.warn("FlowOut Future is created");
@@ -167,11 +169,7 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
return null;
}, delayedExecutor(getFlowoutTimeout(), 
TimeUnit.SECONDS)));
} else {
-   flowoutFuture.ifPresent(f -> {
-   log.warn("FlowOut Future is canceled");
-   f.cancel(true);
-   flowoutFuture = Optional.empty();
-   });
+   dropFlowoutFuture();
}
});
outgoingMedia.addMediaFlowInStateChangeListener(evt -> 
log.warn("Media FlowIn :: {}", evt));
@@ -194,6 +192,21 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
}
}
 
+   public void broadcastRestarted() {
+   if (outgoingMedia != null && flowoutSubscription != null) {
+   
outgoingMedia.removeMediaFlowOutStateChangeListener(flowoutSubscription);
+   }
+   dropFlowoutFuture();
+   }
+
+   private void dropFlowoutFuture() {
+   flowoutFuture.ifPresent(f -> {
+   log.warn("FlowOut Future is canceled");
+   f.cancel(true);
+   flowoutFuture = Optional.empty();
+   });
+   }
+
public void addListener(String sid, String uid, String sdpOffer) {
final boolean self = uid.equals(this.uid);
log.info("USER {}: have started {} in kRoom {}", uid, self ? 
"broadcasting" : "receiving", getRoomId());
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 60c0030..be483e0 100644
--- 
a/op

[openmeetings] branch master updated: [OPENMEETINGS-2521] 'invisible-form-component' CSS class is replaced with hidden attribute

2020-11-20 Thread solomax
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 8000825  [OPENMEETINGS-2521] 'invisible-form-component' CSS class is 
replaced with hidden attribute
8000825 is described below

commit 8000825fbc953aca887ea939bddeb3f7dcb4baca
Author: Maxim Solodovnik 
AuthorDate: Fri Nov 20 20:37:48 2020 +0700

[OPENMEETINGS-2521] 'invisible-form-component' CSS class is replaced with 
hidden attribute
---
 .../main/java/org/apache/openmeetings/web/common/NameDialog.html| 2 +-
 .../org/apache/openmeetings/web/pages/InvitationPasswordDialog.html | 2 +-
 .../apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html| 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html | 2 +-
 .../org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInDialog.html   | 2 +-
 .../java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html | 2 +-
 openmeetings-web/src/main/webapp/css/raw-general.css| 6 --
 8 files changed, 7 insertions(+), 13 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
index cdeb97c..722ffb5 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.html
@@ -24,7 +24,7 @@



-   
+   

 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
index 1fb6424..e8f0448 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.html
@@ -24,7 +24,7 @@



-   
+   

 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
index d483efd..27e2d4b 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
@@ -48,7 +48,7 @@



-   
+   

 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index d6242e2..15d7011 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -80,7 +80,7 @@



-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
index 2d8f9c5..373be93 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
@@ -35,7 +35,7 @@



-   
+   

 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index b3433af..699300c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -72,7 +72,7 @@



-   
+   

 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
index 63a9d25..dc9cbbb 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html

[openmeetings] branch master updated: [OPENMEETINGS-2455] wicket, wicketstuff

2020-11-19 Thread solomax
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 d6f653a  [OPENMEETINGS-2455] wicket, wicketstuff
d6f653a is described below

commit d6f653ac9e632fb7517d9ba600f331e29298ac85
Author: Maxim Solodovnik 
AuthorDate: Fri Nov 20 14:11:34 2020 +0700

[OPENMEETINGS-2455] wicket, wicketstuff
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 91fab35..3089883 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,9 +76,9 @@

3.1.1

5.7.0
-   9.2.0-SNAPSHOT
+   9.2.0
9.1.0
-   9.1.0
+   9.2.0
5.0.2
5.15.1
5.3.1



[openmeetings] branch master updated: [OPENMEETINGS-2517] close button for RTL dialogs is fixed

2020-11-19 Thread solomax
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 075cb23  [OPENMEETINGS-2517] close button for RTL dialogs is fixed
075cb23 is described below

commit 075cb23fc028b6ca356047e9252692444899e9c6
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 19 21:39:29 2020 +0700

[OPENMEETINGS-2517] close button for RTL dialogs is fixed
---
 openmeetings-web/src/main/webapp/css/raw-wb.css | 4 
 1 file changed, 4 insertions(+)

diff --git a/openmeetings-web/src/main/webapp/css/raw-wb.css 
b/openmeetings-web/src/main/webapp/css/raw-wb.css
index 286dfad..a7d8953 100644
--- a/openmeetings-web/src/main/webapp/css/raw-wb.css
+++ b/openmeetings-web/src/main/webapp/css/raw-wb.css
@@ -203,6 +203,10 @@ html[dir="rtl"] .room-block .sb-wb .wb-block {
padding: 1px;
height: 20px;
 }
+html[dir="rtl"] .wb-tool-settings .ui-dialog-titlebar-close, .wb-formula 
.ui-dialog-titlebar-close {
+   left: .3em;
+   right: auto;
+}
 .wb-tool-settings .header, .wb-formula .header {
padding: 5px;
 }



[openmeetings] branch master updated: [OPENMEETINGS-2516] dates in bulgarian locale are fixed

2020-11-19 Thread solomax
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 ac5d6ec  [OPENMEETINGS-2516] dates in bulgarian locale are fixed
ac5d6ec is described below

commit ac5d6ec9a53579a04fdd005da8f3b0a7b9ed69b9
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 19 20:28:50 2020 +0700

[OPENMEETINGS-2516] dates in bulgarian locale are fixed
---
 .../openmeetings/web/common/AbstractOmDateTimePicker.java  |  2 +-
 .../test/java/org/apache/openmeetings/util/TestDateTime.java   | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java
index 96450c2..2c9e2d2 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AbstractOmDateTimePicker.java
@@ -60,7 +60,7 @@ public abstract class AbstractOmDateTimePicker extends 
AbstractDateTimePicker
public static String patch(String format) {
// in Java free text is escaped with single-quotes
// moment.js uses []
-   return format.replaceFirst("(.*)([']{1}(.*)[']{1})(.*)", 
"$1\\[$3\\]$4");
+   return format.replaceAll("[']{1}([^']*)[']{1}", "\\[$1\\]");
}
 
public static String getDateTimeFormat() {
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java 
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
index 8ba8566..8cd53d6 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
@@ -86,4 +86,14 @@ class TestDateTime {
format = 
AbstractOmDateTimePicker.getDateTimeFormat(Locale.ENGLISH);
assertEquals(format, AbstractOmDateTimePicker.patch(format));
}
+
+   @Test
+   void test4() throws Exception {
+   final Locale loc = new Locale.Builder()
+   .setLanguage("bg")
+   .setRegion("BG")
+   .build();
+   String format = AbstractOmDateTimePicker.getDateTimeFormat(loc);
+   assertEquals("d.MM.yy [г]., H:mm [ч].", 
AbstractOmDateTimePicker.patch(format));
+   }
 }



[openmeetings] branch master updated: [OPENMEETINGS-2462] labels are synced

2020-11-19 Thread solomax
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 86f34a3  [OPENMEETINGS-2462] labels are synced
86f34a3 is described below

commit 86f34a307198a5c65f532ab883ed5c1e1c99915b
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 19 17:52:41 2020 +0700

[OPENMEETINGS-2462] labels are synced
---
 .../openmeetings/web/app/Application_ar.properties.xml | 14 +++---
 .../openmeetings/web/app/Application_de.properties.xml |  2 +-
 .../openmeetings/web/app/Application_ko.properties.xml |  4 ++--
 .../openmeetings/web/app/Application_sk.properties.xml |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index d22b79b..ad7ab9f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -169,7 +169,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -305,7 +305,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -823,9 +823,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details
 

]]>
-   
-   
+   
+   



@@ -900,7 +900,7 @@ please check openmeetings.log and contact 
OpenMeetings developers]]>

-   
+   



@@ -949,7 +949,7 @@ please check openmeetings.log and contact 
OpenMeetings developers]]>


-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index f4ea10b..79da784 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -204,7 +204,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 0977bd8..dee0394 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -145,7 +145,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -204,7 +204,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 9281fda..760e915 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -145,7 +145,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   






[openmeetings] branch master updated: [OPENMEETINGS-2462] labels are synced

2020-11-19 Thread solomax
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 86f34a3  [OPENMEETINGS-2462] labels are synced
86f34a3 is described below

commit 86f34a307198a5c65f532ab883ed5c1e1c99915b
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 19 17:52:41 2020 +0700

[OPENMEETINGS-2462] labels are synced
---
 .../openmeetings/web/app/Application_ar.properties.xml | 14 +++---
 .../openmeetings/web/app/Application_de.properties.xml |  2 +-
 .../openmeetings/web/app/Application_ko.properties.xml |  4 ++--
 .../openmeetings/web/app/Application_sk.properties.xml |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index d22b79b..ad7ab9f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -169,7 +169,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -305,7 +305,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -823,9 +823,9 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details
 

]]>
-   
-   
+   
+   



@@ -900,7 +900,7 @@ please check openmeetings.log and contact 
OpenMeetings developers]]>

-   
+   



@@ -949,7 +949,7 @@ please check openmeetings.log and contact 
OpenMeetings developers]]>


-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index f4ea10b..79da784 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -204,7 +204,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 0977bd8..dee0394 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -145,7 +145,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



@@ -204,7 +204,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 9281fda..760e915 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -145,7 +145,7 @@ see https://openmeetings.apache.org/LanguageEditor.html for 
Details



-   
+   






[openmeetings] branch master updated: [OPENMEETINGS-2514] unenroll should be fixed

2020-11-18 Thread solomax
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 059b363  [OPENMEETINGS-2514] unenroll should be fixed
059b363 is described below

commit 059b3638c4c4f821c8d543c7bacb3799fd158054
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 19 10:33:07 2020 +0700

[OPENMEETINGS-2514] unenroll should be fixed
---
 .../org/apache/openmeetings/web/app/Application.java|  1 -
 .../java/org/apache/openmeetings/web/room/raw-room.js   | 17 ++---
 .../openmeetings/web/room/sidebar/RoomSidebar.html  | 10 ++
 .../openmeetings/web/room/sidebar/RoomSidebar.java  | 16 ++--
 .../org/apache/openmeetings/web/room/wb/WbPanel.html| 12 ++--
 .../org/apache/openmeetings/web/room/wb/raw-wb-board.js |  8 +++-
 6 files changed, 31 insertions(+), 33 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index e431f7c..5debb49 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -425,7 +425,6 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
public static void kickUser(Client client) {
if (client != null) {
WebSocketHelper.sendRoom(new 
TextRoomMessage(client.getRoom().getId(), client, RoomMessage.Type.KICK, 
client.getUid()));
-   get().cm.exitRoom(client);
}
}
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 025f98a..a54e350 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -308,14 +308,20 @@ var Room = (function() {
icon.hide();
}
}
-   function __activityIcon(elem, selector, predicate, action) {
+   function __activityIcon(elem, selector, predicate, action, confirm) {
let icon = elem.find(selector);
if (predicate()) {
if (icon.length === 0) {
icon = OmUtil.tmpl('#user-actions-stub ' + 
selector);
elem.append(icon);
}
-   icon.off().click(action);
+   icon.off();
+   if (confirm) {
+   icon.confirmation('dispose');
+   icon.confirmation(confirm)
+   } else {
+   icon.click(action);
+   }
} else {
icon.hide();
}
@@ -440,7 +446,12 @@ var Room = (function() {
__rightOtherIcons(c, actions);
__activityIcon(actions, '.kick'
, () => !self && _hasRight('MODERATOR') && 
!_hasRight('SUPER_MODERATOR', c.rights)
-   , function() { OmUtil.roomAction({action: 'kick', uid: 
c.uid}); });
+   , null
+   , {
+   confirmationEvent: 'om-kick'
+   , placement: Settings.isRtl ? 'left' : 'right'
+   , onConfirm: () => OmUtil.roomAction({action: 
'kick', uid: c.uid})
+   });
__activityIcon(actions, '.private-chat'
, () => options.userId !== c.user.id && 
$('#chatPanel').is(':visible')
, function() {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
index 7b37644..14123fe 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
@@ -60,7 +60,6 @@



-   



@@ -73,14 +72,14 @@



-   
+   






-   
+   


 

[openmeetings] branch master updated: [OPENMEETINGS-2441] invitation saving should be more stable

2020-11-18 Thread solomax
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 b80d897  [OPENMEETINGS-2441] invitation saving should be more stable
b80d897 is described below

commit b80d897bd8865a9a833a4765d6488e19dadd747b
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 23:21:29 2020 +0700

[OPENMEETINGS-2441] invitation saving should be more stable
---
 .../main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
index df76dcc..77a4a95 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
@@ -41,6 +41,7 @@ import javax.persistence.PersistenceContext;
 import org.apache.openmeetings.db.dao.IDataProviderDao;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarHelper;
 import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
@@ -118,6 +119,8 @@ public class InvitationDao implements 
IDataProviderDao {
}
 
public Invitation update(Invitation invitation) {
+   // [OPENMEETINGS-2441] in life cycle state  unmanaged while 
cascading persistence via field
+   invitation.setInvitedBy(em.find(User.class, 
invitation.getInvitedBy().getId()));
if (invitation.getId() == null) {
invitation.setInserted(new Date());
em.persist(invitation);



[openmeetings] branch master updated: [OPENMEETINGS-2441] invitation saving should be more stable

2020-11-18 Thread solomax
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 b80d897  [OPENMEETINGS-2441] invitation saving should be more stable
b80d897 is described below

commit b80d897bd8865a9a833a4765d6488e19dadd747b
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 23:21:29 2020 +0700

[OPENMEETINGS-2441] invitation saving should be more stable
---
 .../main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
index df76dcc..77a4a95 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
@@ -41,6 +41,7 @@ import javax.persistence.PersistenceContext;
 import org.apache.openmeetings.db.dao.IDataProviderDao;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarHelper;
 import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
@@ -118,6 +119,8 @@ public class InvitationDao implements 
IDataProviderDao {
}
 
public Invitation update(Invitation invitation) {
+   // [OPENMEETINGS-2441] in life cycle state  unmanaged while 
cascading persistence via field
+   invitation.setInvitedBy(em.find(User.class, 
invitation.getInvitedBy().getId()));
if (invitation.getId() == null) {
invitation.setInserted(new Date());
em.persist(invitation);



[openmeetings] branch master updated: [OPENMEETINGS-2441] invitation saving should be more stable

2020-11-18 Thread solomax
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 b80d897  [OPENMEETINGS-2441] invitation saving should be more stable
b80d897 is described below

commit b80d897bd8865a9a833a4765d6488e19dadd747b
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 23:21:29 2020 +0700

[OPENMEETINGS-2441] invitation saving should be more stable
---
 .../main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
index df76dcc..77a4a95 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
@@ -41,6 +41,7 @@ import javax.persistence.PersistenceContext;
 import org.apache.openmeetings.db.dao.IDataProviderDao;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarHelper;
 import org.apache.wicket.util.string.Strings;
 import org.slf4j.Logger;
@@ -118,6 +119,8 @@ public class InvitationDao implements 
IDataProviderDao {
}
 
public Invitation update(Invitation invitation) {
+   // [OPENMEETINGS-2441] in life cycle state  unmanaged while 
cascading persistence via field
+   invitation.setInvitedBy(em.find(User.class, 
invitation.getInvitedBy().getId()));
if (invitation.getId() == null) {
invitation.setInserted(new Date());
em.persist(invitation);



[openmeetings] branch master updated: [OPENMEETINGS-2513] code clean-up

2020-11-18 Thread solomax
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 80cfe83  [OPENMEETINGS-2513] code clean-up
80cfe83 is described below

commit 80cfe8355e184667bc93c4ea14d5f34929810fe2
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 22:37:27 2020 +0700

[OPENMEETINGS-2513] code clean-up
---
 .../src/main/java/org/apache/openmeetings/web/pages/BasePage.java  | 2 +-
 .../src/main/java/org/apache/openmeetings/web/user/chat/Chat.java  | 7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 0c993f0..c26357c 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
@@ -137,7 +137,7 @@ public abstract class BasePage extends 
AsyncUrlFragmentAwarePage {
 
@Override
public List getDependencies() {
-   return 
List.of(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=;
 + getGaCode()).setAsync(true));
+   return List.of(new 
PriorityHeaderItem(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=;
 + getGaCode()).setAsync(true)));
}
})));
StringBuilder script = new StringBuilder("initGA('")
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index fdd7598..3d91602 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -176,9 +176,10 @@ public class Chat extends Panel {
 
@Override
public List getDependencies() {
-   return 
List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;", 
"preserve-bs-tooltip")
-   , 
JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())
-   , 
JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;", 
"restore-bs-tooltip")
+   return List.of(
+   new 
PriorityHeaderItem(JavaScriptHeaderItem.forScript("const bstooltip = 
jQuery.fn.tooltip;", "preserve-bs-tooltip"))
+   , new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference()))
+   , new 
PriorityHeaderItem(JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = 
bstooltip;", "restore-bs-tooltip"))
);
}
});



[openmeetings] branch master updated: [OPENMEETINGS-2455] tomcat

2020-11-18 Thread solomax
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 6858971  [OPENMEETINGS-2455] tomcat
6858971 is described below

commit 68589714c1e0bcef3cd8cbba83279dbc6d11e3f0
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 22:05:39 2020 +0700

[OPENMEETINGS-2455] tomcat
---
 openmeetings-server/pom.xml | 2 +-
 pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 655dd7c..53737de 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
prepare-web-server


-   
web-server/apache-tomcat-9.0.39.tar.gz 
+   
web-server/apache-tomcat-9.0.40.tar.gz 



diff --git a/pom.xml b/pom.xml
index dda33e7..91fab35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
5.0.2
5.15.1
5.3.1
-   9.0.39
+   9.0.40
3.0.18
3.4.1
2.7.1



[openmeetings] branch master updated: [OPENMEETINGS-2513] room is displayed as expected if entered via password protected invitation

2020-11-18 Thread solomax
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 b9b202a  [OPENMEETINGS-2513] room is displayed as expected if entered 
via password protected invitation
b9b202a is described below

commit b9b202a120b2720ce46b339e0fe8a7525760a9f8
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 15:49:57 2020 +0700

[OPENMEETINGS-2513] room is displayed as expected if entered via password 
protected invitation
---
 .../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 11 ++-
 .../main/java/org/apache/openmeetings/web/user/chat/Chat.java |  5 ++---
 2 files changed, 12 insertions(+), 4 deletions(-)

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 e0f9780..f79c1bb 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
@@ -81,6 +81,7 @@ import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
+import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -108,6 +109,7 @@ import com.github.openjson.JSONObject;
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
 
 import 
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
@@ -679,7 +681,14 @@ public class RoomPanel extends BasePanel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(interview ? 
INTERVIEWWB_JS_REFERENCE : WB_JS_REFERENCE)));
-   response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new 
JavaScriptResourceReference(RoomPanel.class, "room.js";
+   response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new 
JavaScriptResourceReference(RoomPanel.class, "room.js"))) {
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   public List getDependencies() {
+   return List.of(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference(;
+   }
+   });

response.render(JavaScriptHeaderItem.forReference(TouchPunchResourceReference.instance()));
if (room.isVisible()) {

response.render(OnDomReadyHeaderItem.forScript(roomEnter.getCallbackScript()));
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index ef941e3..fdd7598 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -60,8 +60,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.openjson.JSONObject;
-
-import 
de.agilecoders.wicket.extensions.markup.html.bootstrap.jqueryui.JQueryUIJavaScriptReference;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
 
 public class Chat extends Panel {
private static final long serialVersionUID = 1L;
@@ -178,7 +177,7 @@ public class Chat extends Panel {
@Override
public List getDependencies() {
return 
List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;", 
"preserve-bs-tooltip")
-   , 
JQueryUIJavaScriptReference.asHeaderItem()
+   , 
JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())
, 
JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;", 
"restore-bs-tooltip")
);
}



[openmeetings] branch master updated: [OPENMEETINGS-2513] room is displayed as expected if entered via password protected invitation

2020-11-18 Thread solomax
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 b9b202a  [OPENMEETINGS-2513] room is displayed as expected if entered 
via password protected invitation
b9b202a is described below

commit b9b202a120b2720ce46b339e0fe8a7525760a9f8
Author: Maxim Solodovnik 
AuthorDate: Wed Nov 18 15:49:57 2020 +0700

[OPENMEETINGS-2513] room is displayed as expected if entered via password 
protected invitation
---
 .../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 11 ++-
 .../main/java/org/apache/openmeetings/web/user/chat/Chat.java |  5 ++---
 2 files changed, 12 insertions(+), 4 deletions(-)

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 e0f9780..f79c1bb 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
@@ -81,6 +81,7 @@ import 
org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
 import org.apache.wicket.event.IEvent;
 import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
+import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -108,6 +109,7 @@ import com.github.openjson.JSONObject;
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.interaction.droppable.Droppable;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
 
 import 
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
 import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
@@ -679,7 +681,14 @@ public class RoomPanel extends BasePanel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(interview ? 
INTERVIEWWB_JS_REFERENCE : WB_JS_REFERENCE)));
-   response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new 
JavaScriptResourceReference(RoomPanel.class, "room.js";
+   response.render(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(new 
JavaScriptResourceReference(RoomPanel.class, "room.js"))) {
+   private static final long serialVersionUID = 1L;
+
+   @Override
+   public List getDependencies() {
+   return List.of(new 
PriorityHeaderItem(JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference(;
+   }
+   });

response.render(JavaScriptHeaderItem.forReference(TouchPunchResourceReference.instance()));
if (room.isVisible()) {

response.render(OnDomReadyHeaderItem.forScript(roomEnter.getCallbackScript()));
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index ef941e3..fdd7598 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -60,8 +60,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.github.openjson.JSONObject;
-
-import 
de.agilecoders.wicket.extensions.markup.html.bootstrap.jqueryui.JQueryUIJavaScriptReference;
+import com.googlecode.wicket.jquery.ui.settings.JQueryUILibrarySettings;
 
 public class Chat extends Panel {
private static final long serialVersionUID = 1L;
@@ -178,7 +177,7 @@ public class Chat extends Panel {
@Override
public List getDependencies() {
return 
List.of(JavaScriptHeaderItem.forScript("const bstooltip = jQuery.fn.tooltip;", 
"preserve-bs-tooltip")
-   , 
JQueryUIJavaScriptReference.asHeaderItem()
+   , 
JavaScriptHeaderItem.forReference(JQueryUILibrarySettings.get().getJavaScriptReference())
, 
JavaScriptHeaderItem.forScript("jQuery.fn.tooltip = bstooltip;", 
"restore-bs-tooltip")
);
}



[openmeetings] branch master updated: [OPENMEETINGS-2455] xstream

2020-11-17 Thread solomax
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 f3ba210  [OPENMEETINGS-2455] xstream
f3ba210 is described below

commit f3ba2105936b7c60a065f16c23a933ed39fd3769
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:18:28 2020 +0700

[OPENMEETINGS-2455] xstream
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a304b68..dda33e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
8.0.22
8.4.1.jre11
4.4
-   1.4.13
+   1.4.14
2.0.1
1.0.1
1.24.1



[openmeetings] branch master updated: [OPENMEETINGS-2455] xstream

2020-11-17 Thread solomax
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 f3ba210  [OPENMEETINGS-2455] xstream
f3ba210 is described below

commit f3ba2105936b7c60a065f16c23a933ed39fd3769
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:18:28 2020 +0700

[OPENMEETINGS-2455] xstream
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a304b68..dda33e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
8.0.22
8.4.1.jre11
4.4
-   1.4.13
+   1.4.14
2.0.1
1.0.1
1.24.1



[openmeetings] branch master updated: [OPENMEETINGS-2455] xstream

2020-11-17 Thread solomax
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 f3ba210  [OPENMEETINGS-2455] xstream
f3ba210 is described below

commit f3ba2105936b7c60a065f16c23a933ed39fd3769
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:18:28 2020 +0700

[OPENMEETINGS-2455] xstream
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a304b68..dda33e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
8.0.22
8.4.1.jre11
4.4
-   1.4.13
+   1.4.14
2.0.1
1.0.1
1.24.1



[openmeetings] branch master updated: [OPENMEETINGS-2455] xstream

2020-11-17 Thread solomax
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 f3ba210  [OPENMEETINGS-2455] xstream
f3ba210 is described below

commit f3ba2105936b7c60a065f16c23a933ed39fd3769
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:18:28 2020 +0700

[OPENMEETINGS-2455] xstream
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a304b68..dda33e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,7 +104,7 @@
8.0.22
8.4.1.jre11
4.4
-   1.4.13
+   1.4.14
2.0.1
1.0.1
1.24.1



[openmeetings] branch master updated: [OPENMEETINGS-2511] log level is changed

2020-11-17 Thread solomax
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 2b28cfd  [OPENMEETINGS-2511] log level is changed
2b28cfd is described below

commit 2b28cfdaf74585a6cb92ba25ffd572e59677d4c2
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:00:30 2020 +0700

[OPENMEETINGS-2511] log level is changed
---
 .../src/main/java/org/apache/openmeetings/web/app/Application.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index c8580c7..e431f7c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -666,7 +666,9 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
port = String.valueOf(reqUrl.getPort());
}
String url = (insecure ? "ws" : "wss") + "://" + 
reqUrl.getHost() + delim + port;
-   log.debug("Getting WS url from '{}', result: '{}'", 
reqUrl.toString(StringMode.FULL), url);
+   if (log.isTraceEnabled()) {
+   log.trace("Getting WS url from '{}', result: '{}'", 
reqUrl.toString(StringMode.FULL), url);
+   }
return url;
}
 }



[openmeetings] branch master updated: [OPENMEETINGS-2511] log level is changed

2020-11-17 Thread solomax
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 2b28cfd  [OPENMEETINGS-2511] log level is changed
2b28cfd is described below

commit 2b28cfdaf74585a6cb92ba25ffd572e59677d4c2
Author: Maxim Solodovnik 
AuthorDate: Tue Nov 17 15:00:30 2020 +0700

[OPENMEETINGS-2511] log level is changed
---
 .../src/main/java/org/apache/openmeetings/web/app/Application.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index c8580c7..e431f7c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -666,7 +666,9 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
port = String.valueOf(reqUrl.getPort());
}
String url = (insecure ? "ws" : "wss") + "://" + 
reqUrl.getHost() + delim + port;
-   log.debug("Getting WS url from '{}', result: '{}'", 
reqUrl.toString(StringMode.FULL), url);
+   if (log.isTraceEnabled()) {
+   log.trace("Getting WS url from '{}', result: '{}'", 
reqUrl.toString(StringMode.FULL), url);
+   }
return url;
}
 }



[openmeetings] branch master updated: [OPENMEETINGS-2511] multiple ws-urls are supported

2020-11-15 Thread solomax
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 bc70dbf  [OPENMEETINGS-2511] multiple ws-urls are supported
bc70dbf is described below

commit bc70dbf47e8bc65568c9eeae7a6718ee099c3cb3
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 16 11:37:41 2020 +0700

[OPENMEETINGS-2511] multiple ws-urls are supported
---
 .../java/org/apache/openmeetings/IApplication.java |  3 ++-
 .../db/dao/basic/ConfigurationDao.java |  2 +-
 .../apache/openmeetings/web/app/Application.java   | 23 --
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java 
b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
index 9eecb1f..cc90aa5 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
@@ -19,6 +19,7 @@
 package org.apache.openmeetings;
 
 import java.util.Locale;
+import java.util.Set;
 import java.util.function.Supplier;
 
 import javax.servlet.ServletContext;
@@ -48,5 +49,5 @@ public interface IApplication {
 
//WS
void publishWsTopic(IClusterWsMessage msg);
-   String getWsUrl();
+   Set getWsUrls();
 }
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 709ba5d..bf32ce1 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -602,7 +602,7 @@ public class ConfigurationDao implements 
IDataProviderDao {
addCspRule(cspConfig, CSPDirective.MEDIA_SRC, 
getCspMediaSrc());
addCspRule(cspConfig, CSPDirective.SCRIPT_SRC, 
getCspScriptSrc());
addCspRule(cspConfig, CSPDirective.STYLE_SRC, 
getCspStyleSrc());
-   addCspRule(cspConfig, CSPDirective.CONNECT_SRC, 
app.getWsUrl(), false); // special code for Safari browser
+   app.getWsUrls().forEach(wsUrl -> addCspRule(cspConfig, 
CSPDirective.CONNECT_SRC, wsUrl, false)); // special code for Safari browser
if (!Strings.isEmpty(getGaCode())) {
// 
https://developers.google.com/tag-manager/web/csp#universal_analytics_google_analytics
addCspRule(cspConfig, CSPDirective.IMG_SRC, 
"https://www.google-analytics.com;);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 1b7baaf..c8580c7 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -169,7 +169,7 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
HazelcastInstance hazelcast;
private ITopic hazelWsTopic;
private String serverId;
-   private String wsUrl;
+   private final Set wsUrls = new HashSet<>();
 
@Autowired
private ApplicationContext ctx;
@@ -264,6 +264,15 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
getResourceSettings().getStringResourceLoaders().add(0, new 
LabelResourceLoader());
getRequestCycleListeners().add(new 
WebSocketAwareCsrfPreventionRequestCycleListener() {
@Override
+   public void onBeginRequest(RequestCycle cycle) {
+   String wsUrl = 
getWsUrl(cycle.getRequest().getUrl());
+   if (wsUrl != null && !wsUrls.contains(wsUrl)) {
+   wsUrls.add(wsUrl);
+   cfgDao.updateCsp();
+   }
+   }
+
+   @Override
public void onEndRequest(RequestCycle cycle) {
Response resp = cycle.getResponse();
if (resp instanceof WebResponse) {
@@ -272,12 +281,6 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica

wresp.setHeader("X-XSS-Protection", "1; mode=block");

wresp.setHeader("Strict-Transport-Security", "max-age=31536000; 
includeSubDomains; preload");
 

[openmeetings] branch master updated: [OPENMEETINGS-2511] wssUrl should contain port

2020-11-15 Thread solomax
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 8b0024e  [OPENMEETINGS-2511] wssUrl should contain port
8b0024e is described below

commit 8b0024e9efc9e4b189ebc841e54287f4a38edba8
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 16 09:21:44 2020 +0700

[OPENMEETINGS-2511] wssUrl should contain port
---
 .../apache/openmeetings/web/app/Application.java   | 19 +++
 .../web/app/TestApplicationMocked.java | 39 ++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 5a1f10f..1b7baaf 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -114,6 +114,7 @@ import 
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleLis
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.Response;
 import org.apache.wicket.request.Url;
+import org.apache.wicket.request.Url.StringMode;
 import org.apache.wicket.request.component.IRequestablePage;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.http.WebResponse;
@@ -644,19 +645,25 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
return wsUrl;
}
 
-   private static String getWsUrl(Url reqUrl) {
+   // package private for testing
+   static String getWsUrl(Url reqUrl) {
if (!reqUrl.isFull()) {
return null;
}
final boolean insecure = 
"http".equalsIgnoreCase(reqUrl.getProtocol());
String delim = ":";
-   String port = reqUrl.getPort() == null || reqUrl.getPort() < 0 
? "" : String.valueOf(reqUrl.getPort());
-   if (!port.isEmpty() && ((insecure && 80 == reqUrl.getPort()) || 
(!insecure && 443 == reqUrl.getPort( {
+   String port;
+   if (reqUrl.getPort() == null || reqUrl.getPort() < 0
+   || (insecure && 80 == reqUrl.getPort())
+   || (!insecure && 443 == reqUrl.getPort()))
+   {
port = "";
-   }
-   if (port.isEmpty()) {
delim = "";
+   } else {
+   port = String.valueOf(reqUrl.getPort());
}
-   return String.format("%s://%s%s%s", insecure ? "ws" : "wss", 
reqUrl.getHost(), delim, port);
+   String url = (insecure ? "ws" : "wss") + "://" + 
reqUrl.getHost() + delim + port;
+   log.debug("Getting WS url from '{}', result: '{}'", 
reqUrl.toString(StringMode.FULL), url);
+   return url;
}
 }
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplicationMocked.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplicationMocked.java
new file mode 100644
index 000..7d5fa53
--- /dev/null
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestApplicationMocked.java
@@ -0,0 +1,39 @@
+/*
+ * 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.web.app;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.apache.wicket.request.Url;
+import org.junit.jupiter.api.Test;
+
+class TestApplicationMocked {
+   @Test
+   void testWsUrlIncomplete() {
+   assertNull(Application.getWsUrl(Url.parse("./test")));
+   }
+
+   @Test
+   void testWsUrlNoPort() {
+   a

[openmeetings] branch master updated: [OPENMEETINGS-2510] device list is more fail-safe

2020-11-15 Thread solomax
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 c2f0790  [OPENMEETINGS-2510] device list is more fail-safe
c2f0790 is described below

commit c2f07900d15ef3e84815a1e668834793c98dfb3b
Author: Maxim Solodovnik 
AuthorDate: Sun Nov 15 20:50:30 2020 +0700

[OPENMEETINGS-2510] device list is more fail-safe
---
 .../java/org/apache/openmeetings/web/room/raw-settings.js  | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index dfd5420..614e26b 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -362,7 +362,7 @@ var VideoSettings = (function() {
o.prop('selected', true);
}
function _getDevConstraints(callback) {
-   const devCnts = {audio: false, video: false};
+   const devCnts = {audio: false, video: false, devices: []};
if (window.isSecureContext === false) {
OmUtil.error($('#settings-https-required').text());
return;
@@ -373,6 +373,13 @@ var VideoSettings = (function() {
}
navigator.mediaDevices.enumerateDevices()
.then(devices => devices.forEach(device => {
+   if (DEV_AUDIO === device.kind || 
DEV_VIDEO === device.kind) {
+   devCnts.devices.push({
+   kind: device.kind
+   , label: device.label 
|| (device.kind + ' ' + devCnts.devices.length)
+   , deviceId: 
device.deviceId
+   });
+   }
if (DEV_AUDIO === device.kind) {
devCnts.audio = true;
} else if (DEV_VIDEO === device.kind) {
@@ -405,7 +412,10 @@ var VideoSettings = (function() {
throw err;
})
.finally(() => _clear(stream));
-   return devices;
+   return devices || devCnts.devices;
+   })
+   .catch(function() {
+   return devCnts.devices;
})
.then(devices => {
let cCount = 0, mCount = 0;



[openmeetings] branch master updated: [OPENMEETINGS-2455] resources plugin is downgraded

2020-11-12 Thread solomax
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 d46d89c  [OPENMEETINGS-2455] resources plugin is downgraded
d46d89c is described below

commit d46d89cd04017ab68a70a534de4dc54bc5dd9cb4
Author: Maxim Solodovnik 
AuthorDate: Fri Nov 13 08:15:19 2020 +0700

[OPENMEETINGS-2455] resources plugin is downgraded
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b73a3e..a304b68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
3.1.0
2.0.0
3.0.0
-   
3.2.0
+   
3.1.0
1.5.3
1.0.2
8.7



[openmeetings] branch master updated: [OPENMEETINGS-2455] plugins, spring, cxf, jetty

2020-11-12 Thread solomax
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 602e19b  [OPENMEETINGS-2455] plugins, spring, cxf, jetty
602e19b is described below

commit 602e19b5c1c9cdd69c8942527fc3095d0c5946de
Author: Maxim Solodovnik 
AuthorDate: Thu Nov 12 20:31:47 2020 +0700

[OPENMEETINGS-2455] plugins, spring, cxf, jetty
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 614fe8d..4b73a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@
3.3.1
3.1.0
2.0.0
-   1.8
-   
3.1.0
+   3.0.0
+   
3.2.0
1.5.3
1.0.2
8.7
@@ -81,10 +81,10 @@
9.1.0
5.0.2
5.15.1
-   5.3.0
+   5.3.1
9.0.39
3.0.18
-   3.4.0
+   3.4.1
2.7.1
1.4.1
${project.basedir}
@@ -111,7 +111,7 @@
1.9
1.7.30
1.2.3
-   9.4.33.v20201020
+   9.4.34.v20201102
test
1.67
3.6.0



[openmeetings] branch master updated: no jira: default context.xml is added to the packaging

2020-11-09 Thread solomax
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 65d5445  no jira: default context.xml is added to the packaging
65d5445 is described below

commit 65d54455529dca7264ae220efda25e0a010be4ba
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 9 23:16:39 2020 +0700

no jira: default context.xml is added to the packaging
---
 openmeetings-server/src/main/assembly/components/all.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openmeetings-server/src/main/assembly/components/all.xml 
b/openmeetings-server/src/main/assembly/components/all.xml
index 618480f..0319739 100644
--- a/openmeetings-server/src/main/assembly/components/all.xml
+++ b/openmeetings-server/src/main/assembly/components/all.xml
@@ -107,7 +107,6 @@

${project.parent.basedir}/openmeetings-web/target/openmeetings-web-${project.version}
${om.webapp}

-   META-INF/**
WEB-INF/classes/META-INF/**





[openmeetings] branch master updated: [OPENMEETINGS-2509] web session is invalidated on exit

2020-11-09 Thread solomax
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 db7be4b  [OPENMEETINGS-2509] web session is invalidated on exit
db7be4b is described below

commit db7be4b39a50a48908799c830ae7d42af34e0457
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 9 21:33:45 2020 +0700

[OPENMEETINGS-2509] web session is invalidated on exit
---
 .../src/main/java/org/apache/openmeetings/web/app/WebSession.java   | 2 +-
 .../main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java  | 1 +
 .../src/main/java/org/apache/openmeetings/web/room/raw-settings.js  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 9197201..0228a2a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -149,7 +149,7 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
cm.invalidate(userId, getId());
super.invalidate();
userId = null;
-   rights = 
Collections.unmodifiableSet(Collections.emptySet());
+   rights = Set.of();
iso8601Format = null;
sdf = null;
languageId = -1;
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 87cc23d..e242717 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
@@ -260,6 +260,7 @@ public class RoomMenuPanel extends Panel {

room.getMainPanel().updateContents(ROOMS_PUBLIC, handler);
}
} else {
+   WebSession.get().invalidate();
String url = 
cfgDao.getString(CONFIG_REDIRECT_URL_FOR_EXTERNAL, "");
throw new RedirectToUrlException(Strings.isEmpty(url) ? 
getBaseUrl() : url);
}
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
index 3ff9a23..dfd5420 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
@@ -205,7 +205,7 @@ var VideoSettings = (function() {
_close();
vs.modal("hide");
});
-   vs.off().on('hidden.bs.modal', function (e) {
+   vs.off().on('hidden.bs.modal', function () {
_close();
});
o.width = 300;



[openmeetings] branch master updated: no jira: default context.xml is added

2020-11-08 Thread solomax
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 e8d4a24  no jira: default context.xml is added
e8d4a24 is described below

commit e8d4a2465686b5beef00c135b1078e1fd0de8a66
Author: Maxim Solodovnik 
AuthorDate: Sun Nov 8 19:09:50 2020 +0700

no jira: default context.xml is added
---
 .../src/main/webapp/{WEB-INF/classes => }/META-INF/context.xml| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/context.xml 
b/openmeetings-web/src/main/webapp/META-INF/context.xml
similarity index 100%
rename from 
openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/context.xml
rename to openmeetings-web/src/main/webapp/META-INF/context.xml



[openmeetings] branch master updated: no jira: default context.xml is added

2020-11-08 Thread solomax
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 6ffa6c6  no jira: default context.xml is added
6ffa6c6 is described below

commit 6ffa6c6e382422c9d472a13a76acbc497363b751
Author: Maxim Solodovnik 
AuthorDate: Sun Nov 8 17:05:55 2020 +0700

no jira: default context.xml is added
---
 .../webapp/WEB-INF/classes/META-INF/context.xml| 23 ++
 1 file changed, 23 insertions(+)

diff --git 
a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/context.xml 
b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/context.xml
new file mode 100644
index 000..8393bcd
--- /dev/null
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/context.xml
@@ -0,0 +1,23 @@
+
+
+
+   
+



[openmeetings] 01/02: [OPENMEETINGS-2478] code is improved by using java11 Map

2020-11-07 Thread solomax
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 6333a7728f6c10f997821fd56faeb595b54cfa3e
Author: Maxim Solodovnik 
AuthorDate: Sun Nov 8 13:04:57 2020 +0700

[OPENMEETINGS-2478] code is improved by using java11 Map
---
 .../openmeetings/core/remote/KurentoHandler.java   |   9 +-
 .../db/bind/adapter/OauthMapAdapter.java   |   2 +-
 .../openmeetings/db/dto/user/TestOAuthUser.java|   8 +-
 .../apache/openmeetings/backup/BackupImport.java   | 145 +++--
 .../caldav/handler/AbstractCalendarHandler.java|   9 +-
 .../openmeetings/util/process/ProcessHelper.java   |   4 +-
 .../openmeetings/web/app/LabelResourceLoader.java  |  14 +-
 7 files changed, 90 insertions(+), 101 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 ce9b19c..a0cd23b 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
@@ -25,7 +25,6 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -35,6 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
@@ -225,11 +225,8 @@ public class KurentoHandler {
}
 
private static Map tagsAsMap(MediaObject pipe) {
-   Map map = new HashMap<>();
-   for (Tag t : pipe.getTags()) {
-   map.put(t.getKey(), t.getValue());
-   }
-   return map;
+   return pipe.getTags().stream()
+   .collect(Collectors.toMap(Tag::getKey, 
Tag::getValue));
}
 
Transaction beginTransaction() {
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/OauthMapAdapter.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/OauthMapAdapter.java
index e009901..9807541 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/OauthMapAdapter.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/bind/adapter/OauthMapAdapter.java
@@ -111,6 +111,6 @@ public class OauthMapAdapter extends XmlAdapter> {
if ("mapping".equals(el.getLocalName())) {
return getMap(el.getChildNodes());
}
-   return new HashMap<>();
+   return Map.of();
}
 }
diff --git 
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
 
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
index 5fe3d94..3a5bdb0 100644
--- 
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
+++ 
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
@@ -26,7 +26,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.openmeetings.db.entity.server.OAuthServer;
@@ -141,10 +140,9 @@ class TestOAuthUser {
 
@Test
void map() {
-   Map umap = new HashMap<>();
-   umap.put("login", "abc");
-   umap.put("email", "abc@local");
-   OAuthUser user = new OAuthUser(umap);
+   OAuthUser user = new OAuthUser(Map.of(
+   "login", "abc"
+   , "email", "abc@local"));
assertEquals("abc", user.getLogin(), "Login should be correct");
assertEquals("abc@local", user.getEmail(), "Email should be 
correct");
assertNull(user.getUserData().get(PARAM_FNAME), "First name 
should be empty");
diff --git 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
 
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 66836d0..3bf6aa4 100644
--- 
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++ 
b/openmeetings-install/sr

[openmeetings] branch master updated (72d9e53 -> 4b2972e)

2020-11-07 Thread solomax
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 72d9e53  [OPENMEETINGS-2455] kurento, bcprov
 new 6333a77  [OPENMEETINGS-2478] code is improved by using java11 Map
 new 4b2972e  [OPENMEETINGS-2455] wicket is switched to the next SNAPSHOT

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:
 .../openmeetings/core/remote/KurentoHandler.java   |   9 +-
 .../db/bind/adapter/OauthMapAdapter.java   |   2 +-
 .../openmeetings/db/dto/user/TestOAuthUser.java|   8 +-
 .../apache/openmeetings/backup/BackupImport.java   | 145 +++--
 .../caldav/handler/AbstractCalendarHandler.java|   9 +-
 .../openmeetings/util/process/ProcessHelper.java   |   4 +-
 .../openmeetings/web/app/LabelResourceLoader.java  |  14 +-
 pom.xml|   2 +-
 8 files changed, 91 insertions(+), 102 deletions(-)



[openmeetings] 02/02: [OPENMEETINGS-2455] wicket is switched to the next SNAPSHOT

2020-11-07 Thread solomax
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 4b2972eaecb92d62ffeaf625fb0e9740ff2bb186
Author: Maxim Solodovnik 
AuthorDate: Sun Nov 8 13:05:36 2020 +0700

[OPENMEETINGS-2455] wicket is switched to the next SNAPSHOT
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 551633d..614fe8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@

3.1.1

5.7.0
-   9.1.0
+   9.2.0-SNAPSHOT
9.1.0
9.1.0
5.0.2



[openmeetings] branch master updated: [OPENMEETINGS-2455] kurento, bcprov

2020-11-05 Thread solomax
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 72d9e53  [OPENMEETINGS-2455] kurento, bcprov
72d9e53 is described below

commit 72d9e53e1d84c35cc471f09a7fe91c66456b716c
Author: Maxim Solodovnik 
AuthorDate: Fri Nov 6 10:05:42 2020 +0700

[OPENMEETINGS-2455] kurento, bcprov
---
 openmeetings-web/pom.xml   |  4 ++--
 .../web/pages/auth/ForgetPasswordDialog.java   |  3 ++-
 .../org/apache/openmeetings/web/room/kurento-utils.js  | 18 +-
 pom.xml|  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 13e1695..97b3823 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -39,8 +39,8 @@
mysql

mysql
-   root
-   
+   om_db_admin
+   12345



diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 7923aa2..845f086 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -29,6 +29,7 @@ import org.apache.openmeetings.core.mail.MailHandler;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate;
+import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.common.Captcha;
 import org.apache.openmeetings.web.common.OmModalCloseButton;
 import org.apache.openmeetings.web.pages.ResetPage;
@@ -185,7 +186,7 @@ public class ForgetPasswordDialog extends Modal {
 
String template = ResetPasswordTemplate.getEmail(resetLink);
 
-   mailHandler.send(email, getString("517"), template);
+   mailHandler.send(email, Application.getString("517"), 
template); // Application should be used here to fill placeholder
}
 
private class ForgetPasswordForm extends Form {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
index 7a1a416..0567c9a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/kurento-utils.js
@@ -310,6 +310,10 @@ function WebRtcPeer(mode, options, callback) {
 if (useVideo) {
 pc.addTransceiver('video', { direction: 'recvonly' });
 }
+} else if (mode === 'sendonly') {
+pc.getTransceivers().forEach(function (transceiver) {
+transceiver.direction = 'sendonly';
+});
 }
 if (typeof AdapterJS !== 'undefined' && 
AdapterJS.webrtcDetectedBrowser === 'IE' && AdapterJS.webrtcDetectedVersion >= 
9) {
 var setLocalDescriptionOnSuccess = function () {
@@ -461,10 +465,6 @@ function WebRtcPeer(mode, options, callback) {
 pc.addTrack(track, audioStream);
 });
 }
-var browser = parser.getBrowser();
-if (mode === 'sendonly' && (browser.name === 'Chrome' || browser.name 
=== 'Chromium') && browser.major === 39) {
-mode = 'sendrecv';
-}
 callback();
 }
 if (mode !== 'recvonly' && !videoStream && !audioStream) {
@@ -3241,7 +3241,7 @@ exports.parse = function(sdp) {
 
 },{"sdp-transform":14}],21:[function(require,module,exports){
 /*!
- * UAParser.js v0.7.21
+ * UAParser.js v0.7.22
  * Lightweight JavaScript-based User-Agent string parser
  * https://github.com/faisalman/ua-parser-js
  *
@@ -3258,7 +3258,7 @@ exports.parse = function(sdp) {
 /
 
 
-var LIBVERSION  = '0.7.21',
+var LIBVERSION  = '0.7.22',
 EMPTY   = '',
 UNKNOWN = '?',
 FUNC_TYPE   = 'function',
@@ -3732,7 +3732,7 @@ exports.parse = function(sdp) {
 ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
 
 /d\/huawei([\w\s-]+)[;\)]/i,
-/(nexus\s6p|vog-l29|ane-lx1|eml-l29)/i 
 // Huawei
+/(nexus\s6p|vog-l29|ane-lx1|eml-l29|ele-l29)/i 

[openmeetings] branch master updated: [OPENMEETINGS-2506] chat toolbar should look better

2020-11-02 Thread solomax
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 e74cbe6  [OPENMEETINGS-2506] chat toolbar should look better
e74cbe6 is described below

commit e74cbe6533e1c24d184c0bfd28419e89ea83a420
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 2 22:48:54 2020 +0700

[OPENMEETINGS-2506] chat toolbar should look better
---
 .../apache/openmeetings/web/app/Application.java   |   1 +
 .../openmeetings/web/user/chat/ChatToolbar.html| 111 +++--
 .../apache/openmeetings/web/user/chat/raw-chat.js  |   2 +-
 openmeetings-web/src/main/webapp/css/raw-chat.css  |   6 +-
 .../src/main/webapp/css/raw-variables.css  |   2 +-
 5 files changed, 66 insertions(+), 56 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index d1ba947..5a1f10f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -316,6 +316,7 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
mountPage("reset", ResetPage.class);
+   mountPage("error", InternalErrorPage.class);
mountResource("/recordings/mp4/${id}", new 
Mp4RecordingResourceReference());
mountResource("/recordings/png/${id}", new 
PngRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/room/file/${id}", new RoomResourceReference());
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
index c5df779..919d3c1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatToolbar.html
@@ -21,59 +21,66 @@
 
 http://wicket.apache.org;>
 
-   
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+A 
+   
+   Huge
+   Normal
+   Small
+   
+   
+   
+   
+   
+   
+   
+B 
+I 
+

[openmeetings] branch master updated: [OPENMEETINGS-2505] responsive CSS is added

2020-11-02 Thread solomax
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 4618bfa  [OPENMEETINGS-2505] responsive CSS is added
 new 7222049  Merge branch 'master' of github.com:apache/openmeetings
4618bfa is described below

commit 4618bfaf573919cf07d403be0387ea89aed7f744
Author: Maxim Solodovnik 
AuthorDate: Mon Nov 2 19:51:59 2020 +0700

[OPENMEETINGS-2505] responsive CSS is added
---
 openmeetings-web/pom.xml   |  1 +
 .../src/main/webapp/css/raw-responsive.css | 84 ++
 .../src/main/webapp/css/raw-variables.css  |  1 +
 3 files changed, 86 insertions(+)

diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index c9a6fd1..13e1695 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -109,6 +109,7 @@

raw-room.css

raw-tree.css

raw-wb.css
+   
raw-responsive.css


true

theme.css
diff --git a/openmeetings-web/src/main/webapp/css/raw-responsive.css 
b/openmeetings-web/src/main/webapp/css/raw-responsive.css
new file mode 100644
index 000..9b02db2
--- /dev/null
+++ b/openmeetings-web/src/main/webapp/css/raw-responsive.css
@@ -0,0 +1,84 @@
+/* Licensed under the Apache License, Version 2.0 (the "License") 
http://www.apache.org/licenses/LICENSE-2.0 */
+/* dashboard more responsive */
+#contents .dashboard {
+   display: flex;
+}
+#contents .dashboard > div:nth-child(1) {
+   width: 50%;
+}
+#contents .dashboard > div:nth-child(2) {
+   width: 50%;
+}
+#contents .dashboard .column {
+   width: 100%;
+   float: none;
+}
+
+/* Chat send button width */
+#chatMessage {
+   width: calc(100% - var(--chat-send-width));
+}
+#chat .send {
+   width: var(--chat-send-width);
+   font-size: var(--chat-send-width);
+}
+@media screen and (max-width: 900px), (orientation: portrait) {
+   .dashboard {
+   flex-wrap: wrap;
+   }
+   .dashboard > div:nth-child(1) {
+   flex-basis: 100%;
+   }
+   .dashboard > div:nth-child(2) {
+   flex-basis: 100%;
+   }
+   body {
+   font-size: 1.5vmax;
+   }
+   h3 {
+   font-size: 2.5vmax;
+   }
+   .btn {
+   font-size: 1.5vmax;
+   line-height: 1.5vmax;
+   }
+   #header {
+   font-size: 2.5vmax;
+   }
+   .navbar-toggler-icon {
+   width: 2.5em;
+   height: 2.5em;
+   }
+   .navbar .nav-link {
+   font-size: 1.5vmax;
+   line-height: 1.5vmax;
+   }
+   .dropdown-menu .dropdown-item {
+   font-size: 1.5vmax;
+   line-height: 1.5vmax;
+   }
+}
+
+/* dashboard rooms widgets */
+@media screen and (max-width: 1400px), (orientation: portrait) {
+   .rooms-widget {
+   flex-wrap: wrap;
+   }
+   .rooms-table {
+   flex-basis: 100%;
+   }
+}
+
+/* my/group/public rooms */
+@media screen and (max-width: 900px), (orientation: portrait) {
+   .rooms-table {
+   flex-basis: 100%;
+   height: 50%
+   }
+   .tab-content {
+   flex-wrap: wrap;
+   }
+   .rooms-area {
+   flex-wrap: wrap;
+   }
+}
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css 
b/openmeetings-web/src/main/webapp/css/raw-variables.css
index ed7b789..d63ed6f 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -13,6 +13,7 @@ body {
--chat-tabs-height: 26px;
--chat-tools-height: 37px;
--chat-msg-height: 80px;
+   --chat-send-width: 32px;
 }
 body.no-header {
--header-height: 0px;



[openmeetings] branch master updated: [OPENMEETINGS-2239] code clean-up

2020-10-29 Thread solomax
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 2807167  [OPENMEETINGS-2239] code clean-up
2807167 is described below

commit 2807167a7a571f700f9f27d63468ba6681b4a93b
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 30 09:43:09 2020 +0700

[OPENMEETINGS-2239] code clean-up
---
 .../org/apache/openmeetings/core/remote/KStream.java  | 17 +++--
 .../apache/openmeetings/core/sip/ISipCallbacks.java   |  3 ++-
 .../org/apache/openmeetings/core/sip/SipManager.java  | 17 -
 .../openmeetings/core/sip/SipStackProcessor.java  | 19 ---
 .../org/apache/openmeetings/web/app/Application.java  |  2 +-
 5 files changed, 42 insertions(+), 16 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 8410cd3..650ecbe 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
@@ -179,10 +179,8 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
sipProcessor = kHandler.getSipManager().createSipStackProcessor(
randomUUID().toString()
, kRoom.getRoom()
-   , this); // TODO check this
-   sipProcessor.ifPresent(ssp -> {
-   ssp.register();
-   });
+   , this);
+   sipProcessor.ifPresent(SipStackProcessor::register);
if (kRoom.isRecording()) {
startRecord();
}
@@ -545,8 +543,15 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
}
 
@Override
-   public void onRegister() {
+   public void onRegisterOk() {
rtpEndpoint = getRtpEndpoint(pipeline);
-   sipProcessor.get().invite(kRoom.getRoom(), sdpOffer);
+   outgoingMedia.connect(rtpEndpoint, MediaType.AUDIO); //TODO 
VIDEO
+   sipProcessor.get().invite(kRoom.getRoom(), null);
+   }
+
+   @Override
+   public void onInviteOk(String sdp) {
+   String answer = rtpEndpoint.processOffer(sdp);
+   sipProcessor.get().invite(kRoom.getRoom(), answer);
}
 }
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
index a11fc98..a04f275 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
@@ -19,5 +19,6 @@
 package org.apache.openmeetings.core.sip;
 
 public interface ISipCallbacks {
-   void onRegister();
+   void onRegisterOk();
+   void onInviteOk(String sdp);
 }
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 4c42e88..c55463b 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
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.sip;
 import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
 
+import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -84,6 +85,7 @@ public class SipManager implements ISipManager {
 
private ManagerConnectionFactory factory;
private String sipUserPicture;
+   private BitSet ports;
 
@PostConstruct
public void init() {
@@ -93,6 +95,7 @@ public class SipManager implements ISipManager {
, managerPort
, managerUser
, managerPass);
+   ports = new BitSet(maxLocalWsPort - minLocalWsPort);
}
}
 
@@ -273,6 +276,18 @@ public class SipManager implements ISipManager {
log.warn("Asterisk is not configured or denied in room 
#{}", r.getId());
return Optional.empty();
}
-   return Optional.of(new SipStackProcessor(this, name, 
minLocalWsPort, callbacks)); /// FIXME TODO
+   int port;
+   synchronized (ports) {
+   int free = ports.n

[openmeetings] branch master updated: [OPENMEETINGS-2502] audio/video should start in one step

2020-10-29 Thread solomax
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 b330164  [OPENMEETINGS-2502] audio/video should start in one step
b330164 is described below

commit b330164cb1055d3c5f19bcc0f982a77942ab5e1b
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 30 09:38:49 2020 +0700

[OPENMEETINGS-2502] audio/video should start in one step
---
 .../org/apache/openmeetings/core/remote/StreamProcessor.java |  2 +-
 .../java/org/apache/openmeetings/db/entity/basic/Client.java | 12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 300f77a..60c0030 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -267,7 +267,7 @@ public class StreamProcessor implements IStreamProcessor {
log.debug("User {}: has started broadcast", 
sd.getUid());
kHandler.sendClient(sd.getSid(), newKurentoMsg()
.put("id", "broadcast")
-   .put("stream", sd.toJson())
+   .put("stream", sd.toJson(true))
.put("cleanup", new 
JSONArray(closed))
.put(PARAM_ICE, 
kHandler.getTurnServers(c, false)));
}
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index c069f14..06082fd 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -558,13 +558,21 @@ public class Client implements IDataProviderEntity, 
IWsClient {
}
 
public JSONObject toJson() {
-   return addUserJson(new JSONObject()
+   return toJson(false);
+   }
+
+   public JSONObject toJson(boolean self) {
+   JSONObject o = new JSONObject()
.put("uid", uuid)
.put("type", type.name())
.put("width", swidth)
.put("height", sheight)
.put("activities", new 
JSONArray(sactivities))
-   .put("cuid", uid));
+   .put("cuid", uid);
+   if (self) {
+   o.put("cam", cam).put("mic", mic);
+   }
+   return addUserJson(o);
}
 
@Override



[openmeetings] branch master updated: [OPENMEETINGS-2239] code clean-up

2020-10-29 Thread solomax
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 2807167  [OPENMEETINGS-2239] code clean-up
2807167 is described below

commit 2807167a7a571f700f9f27d63468ba6681b4a93b
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 30 09:43:09 2020 +0700

[OPENMEETINGS-2239] code clean-up
---
 .../org/apache/openmeetings/core/remote/KStream.java  | 17 +++--
 .../apache/openmeetings/core/sip/ISipCallbacks.java   |  3 ++-
 .../org/apache/openmeetings/core/sip/SipManager.java  | 17 -
 .../openmeetings/core/sip/SipStackProcessor.java  | 19 ---
 .../org/apache/openmeetings/web/app/Application.java  |  2 +-
 5 files changed, 42 insertions(+), 16 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 8410cd3..650ecbe 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
@@ -179,10 +179,8 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
sipProcessor = kHandler.getSipManager().createSipStackProcessor(
randomUUID().toString()
, kRoom.getRoom()
-   , this); // TODO check this
-   sipProcessor.ifPresent(ssp -> {
-   ssp.register();
-   });
+   , this);
+   sipProcessor.ifPresent(SipStackProcessor::register);
if (kRoom.isRecording()) {
startRecord();
}
@@ -545,8 +543,15 @@ public class KStream extends AbstractStream implements 
ISipCallbacks {
}
 
@Override
-   public void onRegister() {
+   public void onRegisterOk() {
rtpEndpoint = getRtpEndpoint(pipeline);
-   sipProcessor.get().invite(kRoom.getRoom(), sdpOffer);
+   outgoingMedia.connect(rtpEndpoint, MediaType.AUDIO); //TODO 
VIDEO
+   sipProcessor.get().invite(kRoom.getRoom(), null);
+   }
+
+   @Override
+   public void onInviteOk(String sdp) {
+   String answer = rtpEndpoint.processOffer(sdp);
+   sipProcessor.get().invite(kRoom.getRoom(), answer);
}
 }
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
index a11fc98..a04f275 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/ISipCallbacks.java
@@ -19,5 +19,6 @@
 package org.apache.openmeetings.core.sip;
 
 public interface ISipCallbacks {
-   void onRegister();
+   void onRegisterOk();
+   void onInviteOk(String sdp);
 }
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 4c42e88..c55463b 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
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.sip;
 import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.isSipEnabled;
 
+import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -84,6 +85,7 @@ public class SipManager implements ISipManager {
 
private ManagerConnectionFactory factory;
private String sipUserPicture;
+   private BitSet ports;
 
@PostConstruct
public void init() {
@@ -93,6 +95,7 @@ public class SipManager implements ISipManager {
, managerPort
, managerUser
, managerPass);
+   ports = new BitSet(maxLocalWsPort - minLocalWsPort);
}
}
 
@@ -273,6 +276,18 @@ public class SipManager implements ISipManager {
log.warn("Asterisk is not configured or denied in room 
#{}", r.getId());
return Optional.empty();
}
-   return Optional.of(new SipStackProcessor(this, name, 
minLocalWsPort, callbacks)); /// FIXME TODO
+   int port;
+   synchronized (ports) {
+   int free = ports.n

[openmeetings] branch master updated: [OPENMEETINGS-2502] audio/video should start in one step

2020-10-29 Thread solomax
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 b330164  [OPENMEETINGS-2502] audio/video should start in one step
b330164 is described below

commit b330164cb1055d3c5f19bcc0f982a77942ab5e1b
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 30 09:38:49 2020 +0700

[OPENMEETINGS-2502] audio/video should start in one step
---
 .../org/apache/openmeetings/core/remote/StreamProcessor.java |  2 +-
 .../java/org/apache/openmeetings/db/entity/basic/Client.java | 12 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 300f77a..60c0030 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -267,7 +267,7 @@ public class StreamProcessor implements IStreamProcessor {
log.debug("User {}: has started broadcast", 
sd.getUid());
kHandler.sendClient(sd.getSid(), newKurentoMsg()
.put("id", "broadcast")
-   .put("stream", sd.toJson())
+   .put("stream", sd.toJson(true))
.put("cleanup", new 
JSONArray(closed))
.put(PARAM_ICE, 
kHandler.getTurnServers(c, false)));
}
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index c069f14..06082fd 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -558,13 +558,21 @@ public class Client implements IDataProviderEntity, 
IWsClient {
}
 
public JSONObject toJson() {
-   return addUserJson(new JSONObject()
+   return toJson(false);
+   }
+
+   public JSONObject toJson(boolean self) {
+   JSONObject o = new JSONObject()
.put("uid", uuid)
.put("type", type.name())
.put("width", swidth)
.put("height", sheight)
.put("activities", new 
JSONArray(sactivities))
-   .put("cuid", uid));
+   .put("cuid", uid);
+   if (self) {
+   o.put("cam", cam).put("mic", mic);
+   }
+   return addUserJson(o);
}
 
@Override



[openmeetings] branch master updated: [OPENMEETINGS-2239] tests should be fixed

2020-10-29 Thread solomax
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 0cfee2b  [OPENMEETINGS-2239] tests should be fixed
0cfee2b is described below

commit 0cfee2bbd20952bbc6caa7b3ddd14e3391a35808
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 29 14:52:59 2020 +0700

[OPENMEETINGS-2239] tests should be fixed
---
 .../src/main/webapp/WEB-INF/classes/openmeetings.properties| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 7b966e1..d1cd572 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
@@ -57,7 +57,8 @@ sip.manager.user=openmeetings
 sip.manager.password=12345
 sip.manager.timeout=1
 
-sip.ws.local.port=
+sip.ws.local.port.min=
+sip.ws.local.port.max=7666
 ## 127.0.0.1 is NOT working here
 sip.ws.local.host=
 sip.ws.remote.port=8088



[openmeetings] branch master updated: [OPENMEETINGS-2239] initial commit with jain-sip involved

2020-10-29 Thread solomax
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 49363db  [OPENMEETINGS-2239] initial commit with jain-sip involved
49363db is described below

commit 49363db8e0515da3c2e9051e199f146af460349c
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 29 14:03:32 2020 +0700

[OPENMEETINGS-2239] initial commit with jain-sip involved
---
 .../openmeetings/core/remote/AbstractStream.java   |   5 +
 .../org/apache/openmeetings/core/remote/KRoom.java |  42 ++-
 .../apache/openmeetings/core/remote/KStream.java   | 101 +--
 .../openmeetings/core/remote/KurentoHandler.java   |   2 +-
 .../openmeetings/core/remote/StreamProcessor.java  |  16 +-
 .../openmeetings/core/sip/ISipCallbacks.java   |  23 ++
 .../apache/openmeetings/core/sip/SipManager.java   | 304 ++-
 .../openmeetings/core/sip/SipStackProcessor.java   | 329 +
 .../db/entity/user/AsteriskSipUser.java|  14 +-
 .../src/site/markdown/AsteriskIntegration.md   |  33 +--
 .../web/admin/connection/KStreamDto.java   |   2 +-
 11 files changed, 497 insertions(+), 374 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
index 6de2a46..7891125 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
@@ -22,6 +22,7 @@ import org.kurento.client.MediaPipeline;
 import org.kurento.client.MediaProfileSpecType;
 import org.kurento.client.PlayerEndpoint;
 import org.kurento.client.RecorderEndpoint;
+import org.kurento.client.RtpEndpoint;
 import org.kurento.client.WebRtcEndpoint;
 
 public abstract class AbstractStream {
@@ -60,4 +61,8 @@ public abstract class AbstractStream {
public static PlayerEndpoint createPlayerEndpoint(MediaPipeline 
pipeline, String path) {
return new PlayerEndpoint.Builder(pipeline, path).build();
}
+
+   public static RtpEndpoint createRtpEndpoint(MediaPipeline pipeline) {
+   return new RtpEndpoint.Builder(pipeline).build();
+   }
 }
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
index 433a74e..d1f993d 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
@@ -63,8 +63,7 @@ public class KRoom {
 */
private final StreamProcessor processor;
private final RecordingChunkDao chunkDao;
-   private final Long roomId;
-   private final Room.Type type;
+   private final Room room;
private final AtomicBoolean recordingStarted = new AtomicBoolean(false);
private final AtomicBoolean sharingStarted = new AtomicBoolean(false);
private Long recordingId = null;
@@ -74,17 +73,12 @@ public class KRoom {
public KRoom(KurentoHandler handler, Room r) {
this.processor = handler.getStreamProcessor();
this.chunkDao = handler.getChunkDao();
-   this.roomId = r.getId();
-   this.type = r.getType();
-   log.info("ROOM {} has been created", roomId);
+   this.room = r;
+   log.info("ROOM {} has been created", room.getId());
}
 
-   public Long getRoomId() {
-   return roomId;
-   }
-
-   public Room.Type getType() {
-   return type;
+   public Room getRoom() {
+   return room;
}
 
public Long getRecordingId() {
@@ -96,7 +90,7 @@ public class KRoom {
}
 
public KStream join(final StreamDesc sd, KurentoHandler kHandler) {
-   log.info("ROOM {}: join client {}, stream: {}", roomId, 
sd.getClient(), sd.getUid());
+   log.info("ROOM {}: join client {}, stream: {}", room.getId(), 
sd.getClient(), sd.getUid());
final KStream stream = new KStream(sd, this, kHandler);
processor.addStream(stream);
return stream;
@@ -125,7 +119,7 @@ public class KRoom {
if (recordingStarted.compareAndSet(false, true)) {
IApplication app = 
ensureApplication(c.getUser().getLanguageId());
 
-   log.debug("##REC:: recording in room {} is starting 
::", roomId);
+   log.debug("##REC:: recording in room {} is starting 
::", room.getId());
Room r = c.getRoom();

[openmeetings] branch master updated: [OPENMEETINGS-2455] dependency update

2020-10-28 Thread solomax
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 4e907c5  [OPENMEETINGS-2455] dependency update
4e907c5 is described below

commit 4e907c5a1be076ff46210b51b32d944a8202f680
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 28 22:37:25 2020 +0700

[OPENMEETINGS-2455] dependency update
---
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index eecaed4..7bd0e12 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,8 @@
1.5

3.0.0

3.7.0.1746
-   0.8.5
-   2.7
+   0.8.6
+   3.1

3.1.1

5.7.0
@@ -81,7 +81,7 @@
9.1.0
5.0.2
5.15.1
-   5.2.9.RELEASE
+   5.3.0
9.0.39
3.0.18
3.4.0
@@ -111,10 +111,10 @@
1.9
1.7.30
1.2.3
-   9.4.31.v20200723
+   9.4.33.v20201020
test
1.66
-   3.5.15
+   3.6.0
2.3.2
6.14.0
1.2.307



[openmeetings] branch master updated: [OPENMEETINGS-2497] CSS is fixed for RTL

2020-10-27 Thread solomax
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 a82b8c8  [OPENMEETINGS-2497] CSS is fixed for RTL
a82b8c8 is described below

commit a82b8c81b074d3490b026837706e9486fc6f5382
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 27 23:18:34 2020 +0700

[OPENMEETINGS-2497] CSS is fixed for RTL
---
 openmeetings-web/src/main/webapp/css/raw-general-rtl.css | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css 
b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
index ebd85a1..5899f41 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
@@ -133,6 +133,16 @@ html[dir="rtl"] .list-table th {
text-align: right !important;
 }
 / file-tree **/
+html[dir="rtl"] .trees .om-icon.big::before {
+   left: initial;
+   right: 3px;
+}
+html[dir="rtl"] .file.om-icon
+, html[dir="rtl"] .recording.om-icon
+{
+   padding-left: initial;
+   padding-right: 34px;
+}
 / TODO need to be moved to wicket-jquery-ui **/
 html[dir="rtl"] span.css-emoticon.un-transformed-emoticon
 , html[dir="rtl"] span.css-emoticon.animated-emoticon:hover



[openmeetings] branch master updated: [OPENMEETINGS-2497] tree CSS is simplified and fixed for RTL

2020-10-27 Thread solomax
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 d4e9b82  [OPENMEETINGS-2497] tree CSS is simplified and fixed for RTL
d4e9b82 is described below

commit d4e9b82716db3bea9440d1382ae0edacfe957f1f
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 27 23:02:01 2020 +0700

[OPENMEETINGS-2497] tree CSS is simplified and fixed for RTL
---
 .../src/main/webapp/css/raw-general-rtl.css|   6 +-
 openmeetings-web/src/main/webapp/css/raw-room.css  |  19 
 openmeetings-web/src/main/webapp/css/raw-tree.css  | 111 -
 3 files changed, 24 insertions(+), 112 deletions(-)

diff --git a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css 
b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
index e2d5db6..ebd85a1 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
@@ -113,8 +113,8 @@ html[dir="rtl"] #chat .messageArea .user-row {
padding-right: 40px !important;
background-position-x: 100%;
 }
-html[dir="rtl"] @media screen and (max-width: 1280px) {
-   .room-block .sidebar .tab.om-icon.big {
+@media screen and (max-width: 1280px) {
+   html[dir="rtl"] .room-block .sidebar .tab.om-icon.big {
padding-left: 0 !important;
}
 }
@@ -132,7 +132,7 @@ html[dir="rtl"] .room-block .sidebar .user-list .user 
.ui-icon.audio-activity {
 html[dir="rtl"] .list-table th {
text-align: right !important;
 }
-
+/ file-tree **/
 / TODO need to be moved to wicket-jquery-ui **/
 html[dir="rtl"] span.css-emoticon.un-transformed-emoticon
 , html[dir="rtl"] span.css-emoticon.animated-emoticon:hover
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css 
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 2204572..a46c839 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -792,23 +792,4 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
.room-block.big .sb-wb .sidebar .user-list .user.name {
display: block;
}
-   .room-block .sb-wb .sidebar .file-tree .file.item .name
-   , .room-block .sb-wb .sidebar .file-tree .file.item .name span
-   {
-   width: 40px;
-   }
-   .room-block.big .sb-wb .sidebar .file-tree .file.item .name
-   , .room-block.big .sb-wb .sidebar .file-tree .file.item .name span
-   {
-   width: 255px;
-   }
-   .room-block .sb-wb .sidebar .file-tree .file.item .name span {
-   padding: 0;
-   }
-   .room-block .sb-wb .sidebar .file-tree .file.item {
-   width: 80px;
-   }
-   .room-block.big .sb-wb .sidebar .file-tree .file.item {
-   width: auto;
-   }
 }
diff --git a/openmeetings-web/src/main/webapp/css/raw-tree.css 
b/openmeetings-web/src/main/webapp/css/raw-tree.css
index fdd1983..b09e216 100644
--- a/openmeetings-web/src/main/webapp/css/raw-tree.css
+++ b/openmeetings-web/src/main/webapp/css/raw-tree.css
@@ -15,6 +15,26 @@
height: 2px;
width: 2px;
 }
+.trees .tree-theme-windows
+, .trees .tree-theme-windows > :first-child
+, .trees .tree-theme-windows .tree-branch
+, .trees .tree-theme-windows .tree-branch .tree-node
+, .trees .tree-theme-windows .tree-subtree .tree-branch
+, .trees .tree-theme-windows .tree-node .om-icon
+, .trees .tree-theme-windows .tree-node .om-icon .file.item
+, .trees .tree-theme-windows .tree-node .om-icon .file.item .name
+, .trees .tree-theme-windows .tree-node .om-icon .file.item .name span
+{
+   width: 100%;
+}
+.trees .tree-theme-windows div.tree-subtree
+, .trees .tree-theme-windows .tree-node .om-icon
+{
+   width: calc(100% - 20px);
+}
+.trees .tree-theme-windows .tree-node .om-icon.broken .file.item .name {
+   width: calc(100% - 32px);
+}
 .file-tree .footer {
height: var(--tree-footer-height);
 }
@@ -28,90 +48,6 @@
display: inline-block;
margin: 0 2px;
 }
-/* Calc width with default for max level of 7 */
-.file-tree .file.item .name
-   , .file-tree .file.item .name span
-{
-   max-width: calc(var(--sidebar-width) - 26px);
-   min-width: 60px;
-}
-.file-tree .tree-subtree .file.item .name
-   , .file-tree .tree-subtree .file.item .name span
-{
-   max-width: calc(var(--sidebar-width) - 44px);
-}
-.file-tree .tree-subtree .tree-subtree .file.item .name
-   , .file-tree .tree-subtree .tree-subtree .file.item .name span
-{
-   max-width: calc(var(--sidebar-width) - 62px);
-}
-.file-tree .tree-subtree .tree-subtree .tree-subtree .file.item .name
-   , .file-tree .tree-subtree .tree-subtree 

[openmeetings] branch master updated: [OPENMEETINGS-2496] sdpAnswer and iceCandidate processing performed in 'stable' state

2020-10-26 Thread solomax
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 e3401cb  [OPENMEETINGS-2496] sdpAnswer and iceCandidate processing 
performed in 'stable' state
e3401cb is described below

commit e3401cb8df28a0443d1b7449b406d460092c87a7
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 26 21:17:22 2020 +0700

[OPENMEETINGS-2496] sdpAnswer and iceCandidate processing performed in 
'stable' state
---
 .../src/main/java/org/apache/openmeetings/web/common/main.js | 6 --
 .../src/main/java/org/apache/openmeetings/web/room/raw-video.js  | 9 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
index 6faf49c..97129b1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js
@@ -44,11 +44,13 @@ var OmUtil = (function() {
setTimeout(() => { $(`#${curId}`).alert('close');}, 
autohideAfter);
}
}
-   function _error(msg) {
+   function _error(msg, noAlert) {
if (typeof(msg) === 'object') {
msg = msg.name + ': ' + msg.message;
}
-   __alert('danger', msg, 2);
+   if (noAlert !== true) {
+   __alert('danger', msg, 2);
+   }
return console.error(msg);
}
function _debugEnabled() {
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 01a480b..f600b83 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -576,7 +576,7 @@ var Video = (function() {
}
function _processSdpAnswer(answer) {
const state = states.length > 0 ? states[0] : null;
-   if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned || state.data.rtcPeer.peerConnection.signalingState 
=== 'stable') {
+   if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned) {
return;
}
state.data.rtcPeer.processAnswer(answer, function (error) {
@@ -595,13 +595,13 @@ var Video = (function() {
return;
}
if (error) {
-   return OmUtil.error(error);
+   OmUtil.error(error, true);
}
});
}
function _processIceCandidate(candidate) {
const state = states.length > 0 ? states[0] : null;
-   if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned || state.data.rtcPeer.peerConnection.signalingState 
=== 'stable') {
+   if (!state || state.disposed || !state.data.rtcPeer || 
state.data.rtcPeer.cleaned) {
return;
}
state.data.rtcPeer.addIceCandidate(candidate, function (error) {
@@ -609,8 +609,7 @@ var Video = (function() {
return;
}
if (error) {
-   OmUtil.error('Error adding candidate: ' + 
error);
-   return;
+   OmUtil.error('Error adding candidate: ' + 
error, true);
}
});
}



[openmeetings-site] branch asf-site updated: no jira: HTTPS 4.0.x config is added

2020-10-26 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 5ed0234  no jira: HTTPS 4.0.x config is added
5ed0234 is described below

commit 5ed0234160df3edca57c23f67115ffa223f407ed
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 26 13:47:28 2020 +0700

no jira: HTTPS 4.0.x config is added
---
 RTMPSAndHTTPS.html | 606 +
 1 file changed, 606 insertions(+)

diff --git a/RTMPSAndHTTPS.html b/RTMPSAndHTTPS.html
new file mode 100644
index 000..1a0fb96
--- /dev/null
+++ b/RTMPSAndHTTPS.html
@@ -0,0 +1,606 @@
+ 
+
+
+  
+
+
+
+
+Apache OpenMeetings Project  Using OpenMeetings with RTMPS 
and HTTPS
+
+
+
+  
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+Apache OpenMeetings
+
+
+
+
+
+
+Demo
+Download
+https://cwiki.apache.org/confluence/display/OPENMEETINGS;  title="Wiki"   
class="externalLink nav-link" >Wiki
+
+General 
+
+Home
+https://www.apache.org/licenses/; 
title="License"  class="dropdown-item ">License
+https://www.apache.org/; title="ASF"  
class="dropdown-item ">ASF
+https://www.apache.org/foundation/sponsorship; title="Sponsorship"  
class="dropdown-item ">Sponsorship
+https://www.apache.org/foundation/thanks; 
title="Thanks"  class="dropdown-item ">Thanks
+Call For Logo
+News archive
+Security
+Commercial Support
+
+
+
+Installation 

+
+Installation
+Upgrade
+https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools;
 title="Tutorials"  class="dropdown-item ">Tutorials
+Command Line Admin
+
+
+
+Community 
+
+Get Involved
+Committers
+Our Users
+Mailing Lists
+https://cwiki.apache.org/confluence/display/OPENMEETINGS/; title="Wiki"  
class="dropdown-item ">Wiki
+
+
+
+Configuration 

+
+
+Integration 
   
+SOAP/REST API
+REST API Sample
+Ldap and ADS
+OAuth2
+VoIP and SIP
+Errors table
+CalDAV and Google 
Calendar integration
+External Video/Camera
+
+
+
+Plugins 
   
+Moodle Plugin
+Sakai Plugin
+Jira Plugin
+Joomla Plugin
+Drupal Plugin
+Bitrix Plugin
+Confluence Plugin
+SugarCRM Plugin
+Redmine Plugin
+
+
+
+DB Sample Configurations 
   
+Apache Derby
+IBM DB2
+Oracle
+MySQL
+Postgres
+MSSQL
+
+
+  

[openmeetings] branch master updated: no jira: http links are replaced with https

2020-10-25 Thread solomax
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 77a0b5b  no jira: http links are replaced with https
77a0b5b is described below

commit 77a0b5b8c9255546a5bc1c1332c5f8a1984ce05e
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 26 10:26:38 2020 +0700

no jira: http links are replaced with https
---
 openmeetings-server/src/site/xdoc/WebappNamePath.xml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml 
b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
index a3b7ad9..a2dee7d 100644
--- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml
+++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml
@@ -30,9 +30,9 @@


If you want to have
-   http://yourcorp.com:5080/yourmeetings
+   https://yourcorp.com:5443/yourmeetings
instead of
-   http://yourcorp.com:5080/openmeetings
+   https://yourcorp.com:5443/openmeetings
you need to do the following


@@ -114,8 +114,8 @@


If you want to run multiple Openmeetings 
instances on the same server i.e. to have
-   
http://yourcorp.com:5080/openmeetings1
-   
http://yourcorp.com:5080/openmeetings2 etc. you need to do 
the following:
+   
https://yourcorp.com:5443/openmeetings1
+   
https://yourcorp.com:5443/openmeetings2 etc. you need to do 
the following:






[openmeetings] branch master updated: no jira: http links are replaced with https

2020-10-25 Thread solomax
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 a6579bc  no jira: http links are replaced with https
a6579bc is described below

commit a6579bc16a9d8ee046e2024bd49b3ccdfccf4afc
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 26 10:12:32 2020 +0700

no jira: http links are replaced with https
---
 openmeetings-server/src/site/xdoc/IBMDB2Config.xml   |  2 +-
 openmeetings-server/src/site/xdoc/MSSQLConfig.xml|  2 +-
 openmeetings-server/src/site/xdoc/MySQLConfig.xml|  2 +-
 openmeetings-server/src/site/xdoc/OracleConfig.xml   |  2 +-
 openmeetings-server/src/site/xdoc/PostgresConfig.xml |  2 +-
 openmeetings-server/src/site/xdoc/RestAPISample.xml  | 14 +++---
 openmeetings-server/src/site/xdoc/Upgrade.xml|  4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openmeetings-server/src/site/xdoc/IBMDB2Config.xml 
b/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
index f977ce3..bcb75d4 100644
--- a/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
+++ b/openmeetings-server/src/site/xdoc/IBMDB2Config.xml
@@ -50,7 +50,7 @@


Run OpenMeetings and goto the 
web-based installer:
-   
http://localhost:5080/openmeetings/install
+   
https://localhost:5443/openmeetings/install



diff --git a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml 
b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
index dedf888..104332d 100644
--- a/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MSSQLConfig.xml
@@ -44,7 +44,7 @@


Run OpenMeetings and goto the 
web-based installer:
-   
http://localhost:5080/openmeetings/install
+   
https://localhost:5443/openmeetings/install



diff --git a/openmeetings-server/src/site/xdoc/MySQLConfig.xml 
b/openmeetings-server/src/site/xdoc/MySQLConfig.xml
index 5cd3680..d9bd3c8 100644
--- a/openmeetings-server/src/site/xdoc/MySQLConfig.xml
+++ b/openmeetings-server/src/site/xdoc/MySQLConfig.xml
@@ -50,7 +50,7 @@


Run OpenMeetings and goto the 
web-based installer:
-   
http://localhost:5080/openmeetings/install
+   
https://localhost:5443/openmeetings/install
Or Command 
line installer

diff --git a/openmeetings-server/src/site/xdoc/OracleConfig.xml 
b/openmeetings-server/src/site/xdoc/OracleConfig.xml
index 266e3a3..3183eaf 100644
--- a/openmeetings-server/src/site/xdoc/OracleConfig.xml
+++ b/openmeetings-server/src/site/xdoc/OracleConfig.xml
@@ -39,7 +39,7 @@


Run OpenMeetings and goto the 
web-based installer:
-   
http://localhost:5080/openmeetings/install
+   
https://localhost:5443/openmeetings/install



diff --git a/openmeetings-server/src/site/xdoc/PostgresConfig.xml 
b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
index 2411f38..64d2b99 100644
--- a/openmeetings-server/src/site/xdoc/PostgresConfig.xml
+++ b/openmeetings-server/src/site/xdoc/PostgresConfig.xml
@@ -49,7 +49,7 @@


Run OpenMeetings and goto the 
web-based installer:
-   
http://localhost:5080/openmeetings/install
+   
https://localhost:5443/openmeetings/install



diff --git a/openmeetings-server/src/site/xdoc/RestAPISample.xml 
b/openmeetings-server/src/site/xdoc/RestAPISample.xml
index b915c2a..07ce23b 100644
--- a/openmeetings-server/src/site/xdoc/RestAPISample.xml
+++ b/openmeetings-server/src/site/xdoc/RestAPISample.xml

[openmeetings] branch master updated: [OPENMEETINGS-2490] display name is used instead of first/last name concatenation

2020-10-25 Thread solomax
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 551ce3f  [OPENMEETINGS-2490] display name is used instead of 
first/last name concatenation
551ce3f is described below

commit 551ce3f11e2f290d8a7d45b108c89c9cd889770b
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 25 15:17:40 2020 +0700

[OPENMEETINGS-2490] display name is used instead of first/last name 
concatenation
---
 .../service/mail/template/RequestContactConfirmTemplate.html| 4 ++--
 .../service/mail/template/RequestContactConfirmTemplate.java| 6 ++
 .../openmeetings/service/mail/template/RequestContactTemplate.html  | 4 ++--
 .../openmeetings/service/mail/template/RequestContactTemplate.java  | 6 ++
 .../apache/openmeetings/web/user/profile/MessagesContactsPanel.java | 2 +-
 .../main/java/org/apache/openmeetings/web/util/ContactsHelper.java  | 4 ++--
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
index 585cc24..fe156c6 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
@@ -21,8 +21,8 @@
 
 http://wicket.apache.org;>
 
-   
+   

-   
+   
 
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
index 6f64dc4..d81b5ea 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
@@ -29,10 +29,8 @@ public class RequestContactConfirmTemplate extends 
AbstractTemplatePanel {
private RequestContactConfirmTemplate(UserContact contact) {
super(LocaleHelper.getLocale(contact.getOwner()));
add(new Label("hi", getString("1192", locale)));
-   add(new Label("firstName", contact.getOwner().getFirstname()));
-   add(new Label("lastName", contact.getOwner().getLastname()));
-   add(new Label("addedFirstName", 
contact.getContact().getFirstname()));
-   add(new Label("addedLastName", 
contact.getContact().getLastname()));
+   add(new Label("displayName", 
contact.getOwner().getDisplayName()));
+   add(new Label("addedName", 
contact.getContact().getDisplayName()));
add(new Label("confirmed", getString("1198", locale)));
}
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
index b5c53b3..a3a5aad 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
@@ -21,9 +21,9 @@
 
 http://wicket.apache.org;>
 
-   
+   

-   
+   



diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
index 1781f53..207e013 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
@@ -30,10 +30,8 @@ public class RequestContactTemplate extends 
AbstractTemplatePanel {
private RequestContactTemplate(User userToAdd, User user) {
super(LocaleHelper.getLocale(userToAdd));
add(new Label("hi", getString("1192", locale)));
-   add(new Label("addedFirstName", userToAdd.getFirstname()));
-   add(new Label("addedLastName", userToAdd.getLastname()));
-   add(new Label("firstName", user.getFirstname()));
-   add(new Label("lastName", user.getLastname()));
+ 

[openmeetings] branch master updated: [OPENMEETINGS-2493] code clean-up

2020-10-24 Thread solomax
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 c6eacf0  [OPENMEETINGS-2493] code clean-up
c6eacf0 is described below

commit c6eacf0301016b5bc822a0f0792df571bb24f826
Author: Maxim Solodovnik 
AuthorDate: Sat Oct 24 22:25:12 2020 +0700

[OPENMEETINGS-2493] code clean-up
---
 .../main/java/org/apache/openmeetings/core/remote/KStream.java |  2 +-
 .../org/apache/openmeetings/core/remote/KurentoHandler.java| 10 ++
 .../java/org/apache/openmeetings/web/app/ClientManager.java|  3 ---
 3 files changed, 7 insertions(+), 8 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 c79fd40..1b077eb 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
@@ -356,6 +356,7 @@ public class KStream extends AbstractStream {
public void release(boolean remove) {
if (outgoingMedia != null) {
releaseListeners();
+   releaseRecorder(false);
outgoingMedia.release(new Continuation() {
@Override
public void onSuccess(Void result) throws 
Exception {
@@ -378,7 +379,6 @@ public class KStream extends AbstractStream {
log.warn("PARTICIPANT {}: Could not 
release Pipeline", KStream.this.uid, cause);
}
});
-   releaseRecorder(false);
outgoingMedia = null;
}
if (remove) {
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 7023063..12580c2 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
@@ -469,9 +469,10 @@ public class KurentoHandler {
}
}
} catch (Exception e) {
-   log.warn("Invalid MediaPipeline 
{} detected, will be dropped, tags: {}", pipe.getId(), tags);
-   pipe.release();
+   log.warn("Unexpected error 
while checking MediaPipeline {}, tags: {}", pipe.getId(), tags, e);
}
+   log.warn("Invalid MediaPipeline {} 
detected, will be dropped, tags: {}", pipe.getId(), tags);
+   pipe.release();
}, objCheckTimeout, MILLISECONDS);
} else if (evt.getObject() instanceof Endpoint) {
// endpoint created
@@ -510,9 +511,10 @@ public class KurentoHandler {
return;
}
} catch (Exception e) {
-   
log.warn("Kurento::ObjectCreated -> Invalid Endpoint {} detected, will be 
dropped, tags: {}", point.getId(), tags);
-   point.release();
+   log.warn("Unexpected error 
while checking Endpoint {}, tags: {}", point.getId(), tags, e);
}
+   log.warn("Invalid Endpoint {} detected, 
will be dropped, tags: {}", point.getId(), tags);
+   point.release();
}, objCheckTimeout, MILLISECONDS);
}
}
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 e4f38f0..4521346 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
@@ -37,7 +37,6 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.openmeetings.core.remote.KurentoHandler;
-import org.apache.openmeetings.core.si

[openmeetings] branch master updated: [OPENMEETINGS-2493] tests should be fixed

2020-10-24 Thread solomax
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 17786e1  [OPENMEETINGS-2493] tests should be fixed
17786e1 is described below

commit 17786e12159a5021153e6ee69d8bdf9cc8a1c3a3
Author: Maxim Solodovnik 
AuthorDate: Sat Oct 24 13:24:11 2020 +0700

[OPENMEETINGS-2493] tests should be fixed
---
 .../test/java/org/apache/openmeetings/core/remote/BaseMockedTest.java | 4 
 1 file changed, 4 insertions(+)

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 154c6a7..7402754 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
@@ -27,10 +27,12 @@ import static org.mockito.Mockito.mockStatic;
 
 import java.util.Locale;
 
+import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.core.util.WebSocketHelper;
 import org.apache.openmeetings.db.dao.label.LabelDao;
 import org.apache.openmeetings.db.entity.basic.IWsClient;
 import org.apache.openmeetings.db.entity.label.OmLanguage;
+import org.apache.openmeetings.db.util.ApplicationHelper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kurento.client.KurentoClient;
@@ -83,6 +85,7 @@ public class BaseMockedTest {
try (MockedStatic streamMock = 
mockStatic(AbstractStream.class);
MockedStatic wsHelperMock = 
mockStatic(WebSocketHelper.class);
MockedStatic labelMock = 
mockStatic(LabelDao.class);
+   MockedStatic appHelpMock = 
mockStatic(ApplicationHelper.class);
)
{
wsHelperMock.when(() -> 
WebSocketHelper.sendClient(any(IWsClient.class), 
any(JSONObject.class))).thenAnswer(new Answer() {
@@ -96,6 +99,7 @@ public class BaseMockedTest {
streamMock.when(() -> 
AbstractStream.createPlayerEndpoint(any(MediaPipeline.class), 
anyString())).thenReturn(mock(PlayerEndpoint.class));
 
labelMock.when(() -> 
LabelDao.getLanguage(any(Long.class))).thenReturn(new 
OmLanguage(Locale.ENGLISH));
+   appHelpMock.when(() -> 
ApplicationHelper.ensureApplication(any(Long.class))).thenReturn(mock(IApplication.class));
task.run();
}
}



[openmeetings] branch master updated: [OPENMEETINGS-2493] recording is fixed, code is further improved

2020-10-23 Thread solomax
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 51d4710  [OPENMEETINGS-2493] recording is fixed, code is further 
improved
51d4710 is described below

commit 51d471006506f7a7423eb5e8aa18c34c15e59132
Author: Maxim Solodovnik 
AuthorDate: Sat Oct 24 11:00:04 2020 +0700

[OPENMEETINGS-2493] recording is fixed, code is further improved
---
 .../openmeetings/core/remote/AbstractStream.java   |   6 +-
 .../org/apache/openmeetings/core/remote/KRoom.java |  15 +--
 .../apache/openmeetings/core/remote/KStream.java   |  58 ++--
 .../openmeetings/core/remote/KTestStream.java  | 101 +
 .../openmeetings/core/remote/KurentoHandler.java   |  24 +++--
 .../openmeetings/core/remote/StreamProcessor.java  |  14 ++-
 .../core/remote/TestStreamProcessor.java   |  24 +
 .../core/remote/TestRecordingFlowMocked.java   |   4 +-
 .../core/remote/TestRoomFlowMocked.java|   2 -
 .../apache/openmeetings/web/app/TimerService.java  |   2 +-
 .../apache/openmeetings/web/room/RoomPanel.html|   8 --
 .../org/apache/openmeetings/web/room/raw-sharer.js |  10 +-
 .../openmeetings/web/room/raw-video-manager.js |   8 +-
 .../org/apache/openmeetings/web/room/raw-video.js  |  17 +++-
 .../web/user/record/RecordingsPanel.java   |  11 +--
 15 files changed, 158 insertions(+), 146 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
index c1376d2..6de2a46 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/AbstractStream.java
@@ -41,11 +41,11 @@ public abstract class AbstractStream {
return uid;
}
 
-   public void release(IStreamProcessor processor) {
-   release(processor, true);
+   public void release() {
+   release(true);
}
 
-   public abstract void release(IStreamProcessor processor, boolean 
remove);
+   public abstract void release(boolean remove);
 
public static WebRtcEndpoint createWebRtcEndpoint(MediaPipeline 
pipeline) {
return new WebRtcEndpoint.Builder(pipeline).build();
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
index 8215b37..433a74e 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
@@ -24,6 +24,7 @@ package org.apache.openmeetings.core.remote;
 import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.core.remote.KurentoHandler.PARAM_ICE;
 import static org.apache.openmeetings.core.remote.KurentoHandler.newKurentoMsg;
+import static 
org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
 
 import java.util.Date;
 import java.util.Optional;
@@ -55,7 +56,6 @@ import com.github.openjson.JSONObject;
  *
  */
 public class KRoom {
-
private static final Logger log = LoggerFactory.getLogger(KRoom.class);
 
/**
@@ -63,7 +63,6 @@ public class KRoom {
 */
private final StreamProcessor processor;
private final RecordingChunkDao chunkDao;
-   private final IApplication app;
private final Long roomId;
private final Room.Type type;
private final AtomicBoolean recordingStarted = new AtomicBoolean(false);
@@ -75,7 +74,6 @@ public class KRoom {
public KRoom(KurentoHandler handler, Room r) {
this.processor = handler.getStreamProcessor();
this.chunkDao = handler.getChunkDao();
-   this.app = handler.getApp();
this.roomId = r.getId();
this.type = r.getType();
log.info("ROOM {} has been created", roomId);
@@ -125,6 +123,8 @@ public class KRoom {
 
public void startRecording(Client c) {
if (recordingStarted.compareAndSet(false, true)) {
+   IApplication app = 
ensureApplication(c.getUser().getLanguageId());
+
log.debug("##REC:: recording in room {} is starting 
::", roomId);
Room r = c.getRoom();
boolean interview = Room.Type.INTERVIEW == r.getType();
@@ -164,9 +164,7 @@ public class KRoom {
rec = processor.getRecordingDao().update(rec);
// Receive recordingId
recordingId = rec.getId();
-   processor.getB

[openmeetings] branch master updated: [OPENMEETINGS-2455] libraries and plugins are updated

2020-10-23 Thread solomax
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 e85a6f8  [OPENMEETINGS-2455] libraries and plugins are updated
e85a6f8 is described below

commit e85a6f8bb67a95cdfd52602b0710968c6a8925be
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 23 23:18:19 2020 +0700

[OPENMEETINGS-2455] libraries and plugins are updated
---
 pom.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 959ee7e..eecaed4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,10 +77,10 @@

5.7.0
9.1.0
-   9.0.0
+   9.1.0
9.1.0
-   5.0.1
-   5.15.0
+   5.0.2
+   5.15.1
5.2.9.RELEASE
9.0.39
3.0.18
@@ -96,12 +96,12 @@
3.8.0
2.8.0
2.9.0
-   42.2.17
1.4
2.1.3
1.15
2.8.0
-   8.0.21
+   42.2.18
+   8.0.22
8.4.1.jre11
4.4
1.4.13
@@ -114,7 +114,7 @@
9.4.31.v20200723
test
1.66
-   3.5.13
+   3.5.15
2.3.2
6.14.0
1.2.307



[openmeetings] branch master updated: [OPENMEETINGS-2478] some sonar issues are addressed

2020-10-23 Thread solomax
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 265f035  [OPENMEETINGS-2478] some sonar issues are addressed
265f035 is described below

commit 265f035d7ce5347018c5207edbe84cd85517a13f
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 23 23:12:02 2020 +0700

[OPENMEETINGS-2478] some sonar issues are addressed
---
 .../openmeetings/core/remote/KurentoHandler.java   | 13 -
 .../openmeetings/core/remote/StreamProcessor.java  | 32 +
 .../apache/openmeetings/core/sip/SipManager.java   |  4 +--
 .../core/util/ChatWebSocketHelper.java |  2 +-
 .../db/dao/basic/ConfigurationDao.java |  2 +-
 .../openmeetings/db/entity/basic/Client.java   |  2 +-
 .../apache/openmeetings/db/entity/room/Room.java   |  2 +-
 .../apache/openmeetings/db/entity/user/User.java   |  6 ++--
 .../java/org/apache/openmeetings/cli/Admin.java|  2 +-
 .../openmeetings/service/mail/EmailManager.java|  2 +-
 .../service/room/InvitationManager.java|  2 +-
 .../openmeetings/util/OMContextListener.java   |  2 +-
 .../org/apache/openmeetings/util/OmFileHelper.java | 33 +++---
 .../java/org/apache/openmeetings/util/Version.java |  2 +-
 .../openmeetings/util/process/ProcessHelper.java   | 12 
 .../apache/openmeetings/web/app/Application.java   |  9 +-
 .../org/apache/openmeetings/web/common/main.js |  2 +-
 .../web/user/calendar/calendar-functions.js|  3 +-
 .../web/user/profile/WidgetsPanel.java |  1 -
 19 files changed, 60 insertions(+), 73 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 a43f62c..21ff59e 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
@@ -92,7 +92,7 @@ public class KurentoHandler {
private static final String HMAC_SHA1_ALGORITHM = "HmacSHA1";
private final ScheduledExecutorService kmsRecheckScheduler = 
Executors.newScheduledThreadPool(1);
public static final String KURENTO_TYPE = "kurento";
-   private static int FLOWOUT_TIMEOUT_SEC = 5;
+   private static int flowoutTimeout = 5;
@Value("${kurento.ws.url}")
private String kurentoWsUrl;
@Value("${kurento.turn.url}")
@@ -309,12 +309,11 @@ public class KurentoHandler {
}
 
KRoom getRoom(Long roomId) {
-   KRoom room = rooms.computeIfAbsent(roomId, k -> {
+   return rooms.computeIfAbsent(roomId, k -> {
log.debug("Room {} does not exist. Will create now!", 
roomId);
Room r = roomDao.get(roomId);
return new KRoom(this, r);
});
-   return room;
}
 
public Collection getRooms() {
@@ -410,12 +409,12 @@ public class KurentoHandler {
}
 
static int getFlowoutTimeout() {
-   return FLOWOUT_TIMEOUT_SEC;
+   return flowoutTimeout;
}
 
@Value("${kurento.flowout.timeout}")
private void setFlowoutTimeout(int timeout) {
-   FLOWOUT_TIMEOUT_SEC = timeout;
+   flowoutTimeout = timeout;
}
 
@Value("${kurento.ignored.kuids}")
@@ -465,7 +464,7 @@ public class KurentoHandler {
}
}
}
-   } catch (Throwable e) {
+   } catch (Exception e) {
log.warn("Invalid MediaPipeline 
{} detected, will be dropped, tags: {}", pipe.getId(), tags);
pipe.release();
}
@@ -504,7 +503,7 @@ public class KurentoHandler {
if (stream != null && 
stream.contains(tags.get("uid"))) {
return;
}
-   } catch (Throwable e) {
+   } catch (Exception e) {

log.warn("Kurento::ObjectCreated -> Invalid Endpoint {} detected, will be 
dropped, tags: {}", point.getId(), tags);
point.release();

[openmeetings] branch master updated: [OPENMEETINGS-2492] tests should be fixed

2020-10-23 Thread solomax
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 80ade3f  [OPENMEETINGS-2492] tests should be fixed
80ade3f is described below

commit 80ade3f3becc59543c4ed7f93e18ffac7c800bfe
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 23 16:54:56 2020 +0700

[OPENMEETINGS-2492] tests should be fixed
---
 .../openmeetings/core/remote/TestRecordingFlowMocked.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
index c5d5b1e..428ecf8 100644
--- 
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
+++ 
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
@@ -25,7 +25,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -42,9 +41,10 @@ import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.manager.IClientManager;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.kurento.client.MediaPipeline;
-import org.kurento.client.Transaction;
 import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import com.github.openjson.JSONObject;
 
@@ -72,7 +72,6 @@ class TestRecordingFlowMocked extends BaseMockedTest {
@BeforeEach
public void setup() {
super.setup();
-   
doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
User u = new User();
u.setId(USER_ID);
u.setFirstname("firstname");
@@ -91,7 +90,13 @@ class TestRecordingFlowMocked extends BaseMockedTest {
doReturn(c.getRoom()).when(roomDao).get(ROOM_ID);
 
// Mock out the methods that do webRTC
-   doReturn(null).when(streamProcessor).startBroadcast(any(), 
any(), any(), any());
+   Mockito.doAnswer(new Answer() {
+   @Override
+   public Void answer(InvocationOnMock invocation) throws 
Throwable {
+   invocation.getArgument(3, Runnable.class).run();
+   return null;
+   }
+   }).when(streamProcessor).startBroadcast(any(), any(), any(), 
any());
 
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2492] pipeline is created per KStream

2020-10-23 Thread solomax
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 693bf74  [OPENMEETINGS-2492] pipeline is created per KStream
693bf74 is described below

commit 693bf7496a9c6e1dbcc5ba32e736dc09b1c9f321
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 23 14:39:12 2020 +0700

[OPENMEETINGS-2492] pipeline is created per KStream
---
 .../org/apache/openmeetings/core/remote/KRoom.java | 30 +---
 .../apache/openmeetings/core/remote/KStream.java   | 69 ++---
 .../openmeetings/core/remote/KurentoHandler.java   | 88 +-
 .../openmeetings/core/remote/StreamProcessor.java  | 25 +++---
 .../apache/openmeetings/core/sip/SipManager.java   |  2 +-
 .../core/remote/TestRecordingFlowMocked.java   |  4 +-
 .../apache/openmeetings/web/app/ClientManager.java |  8 +-
 .../apache/openmeetings/web/app/TimerService.java  |  2 +-
 .../apache/openmeetings/web/room/RoomPanel.java|  6 +-
 .../org/apache/openmeetings/web/room/raw-video.js  | 33 
 .../openmeetings/web/app/TestApplication.java  |  2 +-
 11 files changed, 154 insertions(+), 115 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
index c7a8709..8215b37 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KRoom.java
@@ -25,7 +25,6 @@ import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.core.remote.KurentoHandler.PARAM_ICE;
 import static org.apache.openmeetings.core.remote.KurentoHandler.newKurentoMsg;
 
-import java.util.Collection;
 import java.util.Date;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -46,8 +45,6 @@ import org.apache.openmeetings.db.manager.IClientManager;
 import org.apache.openmeetings.db.util.FormatHelper;
 import org.apache.openmeetings.db.util.ws.RoomMessage;
 import org.apache.openmeetings.db.util.ws.TextRoomMessage;
-import org.kurento.client.Continuation;
-import org.kurento.client.MediaPipeline;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +64,6 @@ public class KRoom {
private final StreamProcessor processor;
private final RecordingChunkDao chunkDao;
private final IApplication app;
-   private final MediaPipeline pipeline;
private final Long roomId;
private final Room.Type type;
private final AtomicBoolean recordingStarted = new AtomicBoolean(false);
@@ -76,13 +72,12 @@ public class KRoom {
private JSONObject recordingUser = new JSONObject();
private JSONObject sharingUser = new JSONObject();
 
-   public KRoom(KurentoHandler handler, Room r, MediaPipeline pipeline) {
+   public KRoom(KurentoHandler handler, Room r) {
this.processor = handler.getStreamProcessor();
this.chunkDao = handler.getChunkDao();
this.app = handler.getApp();
this.roomId = r.getId();
this.type = r.getType();
-   this.pipeline = pipeline;
log.info("ROOM {} has been created", roomId);
}
 
@@ -98,25 +93,17 @@ public class KRoom {
return recordingId;
}
 
-   public MediaPipeline getPipeline() {
-   return pipeline;
-   }
-
public RecordingChunkDao getChunkDao() {
return chunkDao;
}
 
-   public KStream join(final StreamDesc sd) {
+   public KStream join(final StreamDesc sd, KurentoHandler kHandler) {
log.info("ROOM {}: join client {}, stream: {}", roomId, 
sd.getClient(), sd.getUid());
-   final KStream stream = new KStream(sd, this);
+   final KStream stream = new KStream(sd, this, kHandler);
processor.addStream(stream);
return stream;
}
 
-   public Collection getParticipants() {
-   return processor.getByRoom(this.getRoomId());
-   }
-
public void onStopBroadcast(KStream stream) {
processor.release(stream, true);
WebSocketHelper.sendAll(newKurentoMsg()
@@ -269,17 +256,6 @@ public class KRoom {
processor.getByRoom(this.getRoomId()).forEach(
stream -> stream.release(processor)
);
-   pipeline.release(new Continuation() {
-   @Override
-   public void onSuccess(Void result) throws Exception {
-   log.trace("ROOM {}: Released Pipeline", 
KRoom.this.roomId);
-   }
-
-   @Overri

[openmeetings] branch master updated: [OPENMEETINGS-2491] wb drag'n'drop is fixed

2020-10-22 Thread solomax
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 5ee9497  [OPENMEETINGS-2491] wb drag'n'drop is fixed
5ee9497 is described below

commit 5ee94978cb95ff7a83f3fde33937a26e175dc28a
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 22 20:12:39 2020 +0700

[OPENMEETINGS-2491] wb drag'n'drop is fixed
---
 .../java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index df58970..43225b3 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -172,7 +172,7 @@ public class WbWebSocketHelper {
sendRoom(
roomId
, new JSONObject().put("type", "wb")
-   , null
+   , alwaysTrue()
, (o, c) -> o.put("func", 
WbAction.createObj.name())
.put("param", 
getObjWbJson(wbId, patchUrls(fi, c, f;
}



[openmeetings] branch master updated: [OPENMEETINGS-2239] tests should be fixed

2020-10-22 Thread solomax
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 
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=1
+### 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=1
 
-#sip.ws.local.port=
+sip.ws.local.port=
 ## 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



[openmeetings] branch master updated: [OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user count is added to the room

2020-10-21 Thread solomax
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 401e498  [OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user 
count is added to the room
401e498 is described below

commit 401e4981c184764d21036204a75ef5dd3098c36e
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 22 12:35:47 2020 +0700

[OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user count is 
added to the room
---
 openmeetings-core/pom.xml  |   8 +
 .../openmeetings/core/remote/KurentoHandler.java   |  85 ++---
 .../openmeetings/core/remote/StreamProcessor.java  |  15 +-
 .../apache/openmeetings/core/sip/SipManager.java   | 108 +--
 .../core/util/ChatWebSocketHelper.java |   5 +-
 .../openmeetings/core/util/WebSocketHelper.java|  33 +-
 openmeetings-db/pom.xml|   9 -
 .../db/dao/calendar/AppointmentDao.java|   2 +-
 .../apache/openmeetings/db/dao/room/RoomDao.java   |   7 +-
 .../apache/openmeetings/db/dao/room/SipConfig.java | 123 ---
 .../openmeetings/db/entity/basic/Client.java   |   5 +
 .../openmeetings/db/manager/IClientManager.java|   6 +-
 .../{dao/room => manager}/IInvitationManager.java  |   2 +-
 .../{IClientManager.java => ISipManager.java}  |  20 +-
 .../openmeetings/db/util/ApplicationHelper.java|   8 +-
 .../openmeetings/db/util/ws/RoomMessage.java   |   2 +-
 .../installation/ImportInitvalues.java |   4 +-
 .../src/site/markdown/AsteriskIntegration.md   |   9 +-
 .../src/site/markdown/InstallMediaServer.md|   2 +-
 openmeetings-server/src/site/site.xml  |   2 +-
 .../src/site/xdoc/PrivacyStatement.xml |  12 +-
 .../src/site/xdoc/voip-sip-integration.xml | 360 -
 .../service/notifier/MailNotifier.java |   2 +-
 .../service/room/InvitationManager.java|   2 +-
 .../{quartz => }/scheduler/AbstractJob.java|   2 +-
 .../service/{quartz => }/scheduler/AtomReader.java |   2 +-
 .../service/{quartz => }/scheduler/CleanupJob.java |  25 +-
 .../{quartz => }/scheduler/ReminderJob.java|   2 +-
 .../web/admin/connection/ConnectionsPanel.java |  12 +-
 .../openmeetings/web/admin/rooms/RoomForm.java |   3 +-
 .../apache/openmeetings/web/app/Application.java   |  10 +
 .../apache/openmeetings/web/app/ClientManager.java |  86 ++---
 .../apache/openmeetings/web/app/TimerService.java  |  61 +++-
 .../apache/openmeetings/web/app/UserManager.java   |   6 +-
 .../apache/openmeetings/web/room/RoomPanel.java|  51 ++-
 .../web/room/menu/SipDialerDialog.java |   4 +-
 .../web/room/wb/WbWebSocketHelper.java |   3 +-
 .../openmeetings/web/user/MessageDialog.java   |   2 +-
 .../openmeetings/web/user/rooms/RoomListPanel.java |   4 +-
 .../openmeetings/web/user/rooms/RoomsPanel.java|   3 +-
 .../webapp/WEB-INF/classes/applicationContext.xml  |  51 +--
 .../webapp/WEB-INF/classes/openmeetings.properties |  65 
 .../openmeetings/service/quartz/TestJob.java   |   4 +-
 .../openmeetings/webservice/RoomWebService.java|  12 +-
 pom.xml|  37 ++-
 45 files changed, 433 insertions(+), 843 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index dd82ded..936ee4c 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -105,6 +105,14 @@
org.kurento
kurento-client

+   
+   org.asteriskjava
+   asterisk-java
+   
+   
+   javax.sip
+   jain-sip-ri
+   


org.junit.jupiter
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 0aa2934..5f1214e 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
@@ -71,10 +71,13 @@ import 
org.kurento.jsonrpc.client.JsonRpcClientNettyWebSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import com.github.openjson.JSONArray;
 import com.github.openjson.JSONObject;
 
+@Component
 public class KurentoHandler {
private static final Logger log = 
LoggerFactory.getLogger(KurentoHandler.class);
public static fina

[openmeetings] branch master updated: [OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user count is added to the room

2020-10-21 Thread solomax
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 401e498  [OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user 
count is added to the room
401e498 is described below

commit 401e4981c184764d21036204a75ef5dd3098c36e
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 22 12:35:47 2020 +0700

[OPENMEETINGS-2239, OPENMEETINGS-677] sip transport with user count is 
added to the room
---
 openmeetings-core/pom.xml  |   8 +
 .../openmeetings/core/remote/KurentoHandler.java   |  85 ++---
 .../openmeetings/core/remote/StreamProcessor.java  |  15 +-
 .../apache/openmeetings/core/sip/SipManager.java   | 108 +--
 .../core/util/ChatWebSocketHelper.java |   5 +-
 .../openmeetings/core/util/WebSocketHelper.java|  33 +-
 openmeetings-db/pom.xml|   9 -
 .../db/dao/calendar/AppointmentDao.java|   2 +-
 .../apache/openmeetings/db/dao/room/RoomDao.java   |   7 +-
 .../apache/openmeetings/db/dao/room/SipConfig.java | 123 ---
 .../openmeetings/db/entity/basic/Client.java   |   5 +
 .../openmeetings/db/manager/IClientManager.java|   6 +-
 .../{dao/room => manager}/IInvitationManager.java  |   2 +-
 .../{IClientManager.java => ISipManager.java}  |  20 +-
 .../openmeetings/db/util/ApplicationHelper.java|   8 +-
 .../openmeetings/db/util/ws/RoomMessage.java   |   2 +-
 .../installation/ImportInitvalues.java |   4 +-
 .../src/site/markdown/AsteriskIntegration.md   |   9 +-
 .../src/site/markdown/InstallMediaServer.md|   2 +-
 openmeetings-server/src/site/site.xml  |   2 +-
 .../src/site/xdoc/PrivacyStatement.xml |  12 +-
 .../src/site/xdoc/voip-sip-integration.xml | 360 -
 .../service/notifier/MailNotifier.java |   2 +-
 .../service/room/InvitationManager.java|   2 +-
 .../{quartz => }/scheduler/AbstractJob.java|   2 +-
 .../service/{quartz => }/scheduler/AtomReader.java |   2 +-
 .../service/{quartz => }/scheduler/CleanupJob.java |  25 +-
 .../{quartz => }/scheduler/ReminderJob.java|   2 +-
 .../web/admin/connection/ConnectionsPanel.java |  12 +-
 .../openmeetings/web/admin/rooms/RoomForm.java |   3 +-
 .../apache/openmeetings/web/app/Application.java   |  10 +
 .../apache/openmeetings/web/app/ClientManager.java |  86 ++---
 .../apache/openmeetings/web/app/TimerService.java  |  61 +++-
 .../apache/openmeetings/web/app/UserManager.java   |   6 +-
 .../apache/openmeetings/web/room/RoomPanel.java|  51 ++-
 .../web/room/menu/SipDialerDialog.java |   4 +-
 .../web/room/wb/WbWebSocketHelper.java |   3 +-
 .../openmeetings/web/user/MessageDialog.java   |   2 +-
 .../openmeetings/web/user/rooms/RoomListPanel.java |   4 +-
 .../openmeetings/web/user/rooms/RoomsPanel.java|   3 +-
 .../webapp/WEB-INF/classes/applicationContext.xml  |  51 +--
 .../webapp/WEB-INF/classes/openmeetings.properties |  65 
 .../openmeetings/service/quartz/TestJob.java   |   4 +-
 .../openmeetings/webservice/RoomWebService.java|  12 +-
 pom.xml|  37 ++-
 45 files changed, 433 insertions(+), 843 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index dd82ded..936ee4c 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -105,6 +105,14 @@
org.kurento
kurento-client

+   
+   org.asteriskjava
+   asterisk-java
+   
+   
+   javax.sip
+   jain-sip-ri
+   


org.junit.jupiter
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 0aa2934..5f1214e 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
@@ -71,10 +71,13 @@ import 
org.kurento.jsonrpc.client.JsonRpcClientNettyWebSocket;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import com.github.openjson.JSONArray;
 import com.github.openjson.JSONObject;
 
+@Component
 public class KurentoHandler {
private static final Logger log = 
LoggerFactory.getLogger(KurentoHandler.class);
public static fina

[openmeetings] branch master updated: [OPENMEETINGS-2481] cancelation email works as expected

2020-10-16 Thread solomax
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 adabede  [OPENMEETINGS-2481] cancelation email works as expected
adabede is described below

commit adabede9e5f42fec4f804929b682a675cae71bad
Author: Maxim Solodovnik 
AuthorDate: Sat Oct 17 11:05:39 2020 +0700

[OPENMEETINGS-2481] cancelation email works as expected
---
 .../apache/openmeetings/core/mail/MailHandler.java |  2 +-
 .../db/dao/calendar/AppointmentDao.java| 20 +++
 .../db/dao/room/IInvitationManager.java|  2 +-
 .../openmeetings/db/entity/basic/MailMessage.java  | 27 +--
 .../service/room/InvitationManager.java| 19 +-
 .../openmeetings/util/OpenmeetingsVariables.java   |  2 +-
 .../apache/openmeetings/util/mail/IcalHandler.java | 40 +++---
 7 files changed, 86 insertions(+), 26 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
index 3fbcc18..5e42772 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
@@ -98,7 +98,7 @@ public class MailHandler {
BodyPart iCalContent = new MimeBodyPart();
iCalContent.addHeader("content-class", 
"urn:content-classes:calendarmessage");
iCalContent.setDataHandler(new DataHandler(new 
ByteArrayDataSource(new ByteArrayInputStream(m.getIcs()),
-   "text/calendar; charset=UTF-8; 
method=REQUEST")));
+   "text/calendar; charset=UTF-8; method=" + 
m.getIcsMethod(;
multiBody.addBodyPart(iCalContent);
BodyPart body = new MimeBodyPart();
body.setContent(multiBody);
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index a4b7c8d..988bc2e 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -34,10 +34,12 @@ import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.openmeetings.db.dao.IDataProviderDao;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.room.IInvitationManager;
 import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dto.calendar.AppointmentDTO;
 import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
 import org.apache.openmeetings.db.entity.calendar.MeetingMember;
@@ -100,10 +102,13 @@ public class AppointmentDao implements 
IDataProviderDao{
}
a.setRoom(roomDao.update(r, userId));
final boolean newApp = a.getId() == null;
-   Appointment a0 = null;
+   AppointmentDTO a0 = null;
Set mmIds = Set.of();
if (sendmails && !newApp) {
-   a0 = get(a.getId());
+   Appointment prev = get(a.getId());
+   if (prev != null) {
+   a0 = new AppointmentDTO(prev);
+   }
mmIds = 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
}
if (newApp) {
@@ -116,11 +121,12 @@ public class AppointmentDao implements 
IDataProviderDao{
}
if (sendmails) {
// update meeting members
-   boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
-   !(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
-   !(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
-   !a0.getStart().equals(a.getStart()) ||
-   !a0.getEnd().equals(a.getEnd());
+   boolean sendMail = a0 == null
+   || !StringUtils.equals(a0.getTitle(), 
a.getTitle())
+   || 
!StringUtils.equals(a0.getDescription(), a.getDescription())
+   || 
!St

[openmeetings] branch master updated: [OPENMEETINGS-2481] another attempt to fix cancel

2020-10-16 Thread solomax
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 28356c1  [OPENMEETINGS-2481] another attempt to fix cancel
28356c1 is described below

commit 28356c12e267b6f179d20029df0766df47b9503c
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 16 23:51:49 2020 +0700

[OPENMEETINGS-2481] another attempt to fix cancel
---
 .../src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java| 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index bf09304..ff9e558 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -47,6 +47,7 @@ import net.fortuna.ical4j.model.property.Method;
 import net.fortuna.ical4j.model.property.Organizer;
 import net.fortuna.ical4j.model.property.ProdId;
 import net.fortuna.ical4j.model.property.Sequence;
+import net.fortuna.ical4j.model.property.Status;
 import net.fortuna.ical4j.model.property.Transp;
 import net.fortuna.ical4j.model.property.Uid;
 import net.fortuna.ical4j.model.property.Version;
@@ -106,6 +107,7 @@ public class IcalHandler {
 
meeting = new VEvent(start, end, name);
meeting.getProperties().add(Method.CANCEL == method ? 
Transp.TRANSPARENT : Transp.OPAQUE);
+   meeting.getProperties().add(Status.VEVENT_CONFIRMED);
return this;
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2481] another attempt to fix cancel

2020-10-16 Thread solomax
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 5e8a6f8  [OPENMEETINGS-2481] another attempt to fix cancel
5e8a6f8 is described below

commit 5e8a6f8340cef65e6f39327d24c886c7e8e78c30
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 16 23:37:43 2020 +0700

[OPENMEETINGS-2481] another attempt to fix cancel
---
 .../service/room/InvitationManager.java|  9 
 .../apache/openmeetings/util/mail/IcalHandler.java |  2 +-
 .../openmeetings/invitiation/TestInvitation.java   | 25 ++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 53a69db..5a36f1f 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -97,10 +97,12 @@ public class InvitationManager implements 
IInvitationManager {
 
@Override
public void sendInvitationLink(Invitation i, MessageType type, String 
subject, String message, boolean ical, String baseUrl) throws Exception {
-   String invitationLink = null;
+   final String invitationLink;
if (type != MessageType.CANCEL) {
IApplication app = ensureApplication(1L);
invitationLink = app.getOmInvitationLink(i, baseUrl);
+   } else {
+   invitationLink = null;
}
User owner = i.getInvitedBy();
 
@@ -110,7 +112,6 @@ public class InvitationManager implements 
IInvitationManager {
String replyToEmail = owner.getAddress().getEmail();
 
if (ical) {
-   String username = i.getInvitee().getLogin();
boolean isOwner = 
owner.getId().equals(i.getInvitee().getId());
Appointment a = i.getAppointment();
String desc = a.getDescription() == null ? "" : 
a.getDescription();
@@ -123,8 +124,8 @@ public class InvitationManager implements 
IInvitationManager {
.setDescription(desc)
.setUid(a.getIcalId())
.setSequence(0)
-   .addOrganizer(replyToEmail, 
owner.getLogin())
-   .addAttendee(email, username, isOwner)
+   .addOrganizer(replyToEmail, 
owner.getDisplayName())
+   .addAttendee(email, 
i.getInvitee().getLogin(), isOwner)
.build();
 
log.debug(handler.toString());
diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 42b18a8..bf09304 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -105,7 +105,7 @@ public class IcalHandler {
end.setTimeZone(timeZone);
 
meeting = new VEvent(start, end, name);
-   meeting.getProperties().add(Transp.OPAQUE);
+   meeting.getProperties().add(Method.CANCEL == method ? 
Transp.TRANSPARENT : Transp.OPAQUE);
return this;
}
 
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index 37194be..ec508a2 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -19,14 +19,18 @@
 package org.apache.openmeetings.invitiation;
 
 import static org.apache.openmeetings.util.CalendarHelper.getDate;
+import static org.junit.Assert.assertNotNull;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 import org.apache.openmeetings.AbstractWicketTester;
 import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.Invitation.MessageType;
 import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.room.Roo

[openmeetings] branch master updated: [OPENMEETINGS-2481] tests should be fixed

2020-10-16 Thread solomax
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 e949dbf  [OPENMEETINGS-2481] tests should be fixed
e949dbf is described below

commit e949dbf5031212cd81b35cb8a0c4367fea050355
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 16 23:01:08 2020 +0700

[OPENMEETINGS-2481] tests should be fixed
---
 .../org/apache/openmeetings/util/mail/IcalHandler.java   |  2 +-
 .../openmeetings/calendar/TestSendIcalMessage.java   | 16 +++-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 7f10b71..42b18a8 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -143,8 +143,8 @@ public class IcalHandler {
public IcalHandler addAttendee(String email, String display, boolean 
chair) {
Attendee uno = new Attendee(URI.create(MAILTO + email));
uno.getParameters().add(chair ? Role.CHAIR : 
Role.REQ_PARTICIPANT);
-   uno.getParameters().add(new Cn(display));
uno.getParameters().add(Method.CANCEL == method ? 
PartStat.DECLINED : PartStat.ACCEPTED);
+   uno.getParameters().add(new Cn(display));
meeting.getProperties().add(uno);
return this;
}
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index 429e120..7da0ed6 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@ -30,7 +30,6 @@ import javax.activation.DataHandler;
 import javax.mail.BodyPart;
 import javax.mail.Message;
 import javax.mail.Multipart;
-import javax.mail.Transport;
 import javax.mail.internet.InternetAddress;
 import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
@@ -51,8 +50,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
@Autowired
private MailHandler mailHandler;
 
-   private byte[] iCalMimeBody;
-
String subject = "test iCal";
String recipients = "seba.wag...@gmail.com";
String htmlBody = "test";
@@ -81,12 +78,10 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
log.debug("ICS: {}", handler.toString());
assertNotNull(handler.toString(), "Valid ICS should be 
created");
 
-   iCalMimeBody = handler.toByteArray();
-
-   sendIcalMessage();
+   sendIcalMessage(handler.toByteArray());
}
 
-   private void sendIcalMessage() throws Exception {
+   private void sendIcalMessage(byte[] iCalMimeBody) throws Exception {
log.debug("sendIcalMessage");
 
// Building MimeMessage
@@ -114,11 +109,6 @@ class TestSendIcalMessage extends AbstractJUnitDefaults {
mimeMessage.setSentDate(new Date());
mimeMessage.setContent(multipart);
 
-   // -- Set some other header information --
-   // mimeMessage.setHeader("X-Mailer", "XML-Mail");
-   // mimeMessage.setSentDate(new Date());
-
-   // Transport trans = session.getTransport("smtp");
-   Transport.send(mimeMessage);
+   assertNotNull(mimeMessage, "Valid MIME message should be 
created");
}
 }



[openmeetings] branch master updated: [OPENMEETINGS-2481] first attempt to fix cancelation on Mozilla

2020-10-16 Thread solomax
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 791c1f3  [OPENMEETINGS-2481] first attempt to fix cancelation on 
Mozilla
791c1f3 is described below

commit 791c1f39dea96e9291c27d952310d93da2287e99
Author: Maxim Solodovnik 
AuthorDate: Fri Oct 16 21:53:28 2020 +0700

[OPENMEETINGS-2481] first attempt to fix cancelation on Mozilla
---
 .../org/apache/openmeetings/service/room/InvitationManager.java | 6 +-
 .../main/java/org/apache/openmeetings/util/mail/IcalHandler.java| 4 
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index a4eae5c..53a69db 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -113,10 +113,14 @@ public class InvitationManager implements 
IInvitationManager {
String username = i.getInvitee().getLogin();
boolean isOwner = 
owner.getId().equals(i.getInvitee().getId());
Appointment a = i.getAppointment();
+   String desc = a.getDescription() == null ? "" : 
a.getDescription();
+   if (invitationLink != null) {
+   desc += (desc.isEmpty() ? "" : "\n\n\n") + 
invitationLink;
+   }
IcalHandler handler = new 
IcalHandler(MessageType.CANCEL == type ? IcalHandler.ICAL_METHOD_CANCEL : 
IcalHandler.ICAL_METHOD_REQUEST)

.createVEvent(getTimeZone(owner).getID(), a.getStart(), a.getEnd(), 
a.getTitle())
.setLocation(a.getLocation())
-   .setDescription(a.getDescription() + 
"\n\n\n" + invitationLink)
+   .setDescription(desc)
.setUid(a.getIcalId())
.setSequence(0)
.addOrganizer(replyToEmail, 
owner.getLogin())
diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index b9fbb9b..7f10b71 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -37,6 +37,7 @@ import net.fortuna.ical4j.model.TimeZoneRegistry;
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.parameter.Cn;
+import net.fortuna.ical4j.model.parameter.PartStat;
 import net.fortuna.ical4j.model.parameter.Role;
 import net.fortuna.ical4j.model.property.Attendee;
 import net.fortuna.ical4j.model.property.CalScale;
@@ -66,6 +67,7 @@ public class IcalHandler {
private final Calendar icsCalendar;
private TimeZone timeZone;
private VEvent meeting;
+   private Method method;
 
/** Creation of a new Event */
public static final Method ICAL_METHOD_REQUEST = Method.REQUEST;
@@ -79,6 +81,7 @@ public class IcalHandler {
 *(@see IcalHandler) constants
 */
public IcalHandler(Method method) {
+   this.method = method;
log.debug("Icalhandler method type : {}", method);
 
icsCalendar = new Calendar();
@@ -141,6 +144,7 @@ public class IcalHandler {
Attendee uno = new Attendee(URI.create(MAILTO + email));
uno.getParameters().add(chair ? Role.CHAIR : 
Role.REQ_PARTICIPANT);
uno.getParameters().add(new Cn(display));
+   uno.getParameters().add(Method.CANCEL == method ? 
PartStat.DECLINED : PartStat.ACCEPTED);
meeting.getProperties().add(uno);
return this;
}



[openmeetings] branch master updated: [OPENMEETINGS-2481] some typos are fixed

2020-10-15 Thread solomax
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 4b78698  [OPENMEETINGS-2481] some typos are fixed
4b78698 is described below

commit 4b786980e0224fe7e5fe629274f1d425bf278324
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 22:25:40 2020 +0700

[OPENMEETINGS-2481] some typos are fixed
---
 .../apache/openmeetings/db/dao/calendar/AppointmentDao.java| 10 ++
 .../apache/openmeetings/service/room/InvitationManager.java|  7 ---
 .../java/org/apache/openmeetings/util/mail/IcalHandler.java|  2 +-
 .../org/apache/openmeetings/calendar/TestSendIcalMessage.java  |  7 ---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index c97654e..a4b7c8d 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -26,7 +26,6 @@ import static 
org.apache.openmeetings.util.OpenmeetingsVariables.PARAM_USER_ID;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -101,7 +100,12 @@ public class AppointmentDao implements 
IDataProviderDao{
}
a.setRoom(roomDao.update(r, userId));
final boolean newApp = a.getId() == null;
-   Appointment a0 = newApp ? null : get(a.getId());
+   Appointment a0 = null;
+   Set mmIds = Set.of();
+   if (sendmails && !newApp) {
+   a0 = get(a.getId());
+   mmIds = 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
+   }
if (newApp) {
a.setInserted(new Date());
a.setIcalId(randomUUID().toString());
@@ -111,8 +115,6 @@ public class AppointmentDao implements 
IDataProviderDao{
a = em.merge(a);
}
if (sendmails) {
-   Set mmIds = newApp ? new HashSet<>()
-   : 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 0192d1b..a4eae5c 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -115,11 +115,12 @@ public class InvitationManager implements 
IInvitationManager {
Appointment a = i.getAppointment();
IcalHandler handler = new 
IcalHandler(MessageType.CANCEL == type ? IcalHandler.ICAL_METHOD_CANCEL : 
IcalHandler.ICAL_METHOD_REQUEST)

.createVEvent(getTimeZone(owner).getID(), a.getStart(), a.getEnd(), 
a.getTitle())
-   .addOrganizer(replyToEmail, 
owner.getLogin())
-   .addAttendee(email, username, isOwner)
.setLocation(a.getLocation())
-   .setDescription(invitationLink)
+   .setDescription(a.getDescription() + 
"\n\n\n" + invitationLink)
.setUid(a.getIcalId())
+   .setSequence(0)
+   .addOrganizer(replyToEmail, 
owner.getLogin())
+   .addAttendee(email, username, isOwner)
.build();
 
log.debug(handler.toString());
diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index 3d30ab7..b9fbb9b 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -139,7 +139,7 @@ public class IcalHandler {
 
  

[openmeetings] branch master updated: [OPENMEETINGS-2481] initial refactoring of IcalHandler

2020-10-15 Thread solomax
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 cde0394  [OPENMEETINGS-2481] initial refactoring of IcalHandler
cde0394 is described below

commit cde03944fbb9ec4e4bd95451673f3c75ac809536
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 21:03:54 2020 +0700

[OPENMEETINGS-2481] initial refactoring of IcalHandler
---
 .../db/dao/calendar/AppointmentDao.java|   4 +-
 .../service/calendar/caldav/IcalUtils.java |  12 +-
 .../service/room/InvitationManager.java|  37 ++---
 .../apache/openmeetings/util/mail/IcalHandler.java | 130 ++---
 .../apache/openmeetings/util/mail/MailUtil.java|   2 +
 .../openmeetings/calendar/TestSendIcalMessage.java | 161 -
 6 files changed, 97 insertions(+), 249 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 474df5d..c97654e 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.db.dao.calendar;
 
+import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.db.util.DaoHelper.UNSUPPORTED;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.PARAM_USER_ID;
@@ -100,8 +101,10 @@ public class AppointmentDao implements 
IDataProviderDao{
}
a.setRoom(roomDao.update(r, userId));
final boolean newApp = a.getId() == null;
+   Appointment a0 = newApp ? null : get(a.getId());
if (newApp) {
a.setInserted(new Date());
+   a.setIcalId(randomUUID().toString());
em.persist(a);
} else {
a.setUpdated(new Date());
@@ -111,7 +114,6 @@ public class AppointmentDao implements 
IDataProviderDao{
Set mmIds = newApp ? new HashSet<>()
: 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
-   Appointment a0 = newApp ? null : get(a.getId());
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
!(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
index 53a8cae..57a3ce2 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
@@ -20,6 +20,8 @@ package org.apache.openmeetings.service.calendar.caldav;
 
 import static java.util.UUID.randomUUID;
 import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
+import static org.apache.openmeetings.util.mail.MailUtil.MAILTO;
+import static org.apache.openmeetings.util.mail.MailUtil.SCHEME_MAILTO;
 
 import java.net.URI;
 import java.text.ParsePosition;
@@ -228,7 +230,7 @@ public class IcalUtils {
URI uri = URI.create(organizer.getValue());
 
//If the value of the organizer is an email
-   if ("mailto".equals(uri.getScheme())) {
+   if (SCHEME_MAILTO.equals(uri.getScheme())) {
String email = uri.getSchemeSpecificPart();
 
organizerEmail = email;
@@ -248,7 +250,7 @@ public class IcalUtils {
if (attendees != null && !attendees.isEmpty()) {
for (Property attendee : attendees) {
URI uri = URI.create(attendee.getValue());
-   if ("mailto".equals(uri.getScheme())) {
+   if (SCHEME_MAILTO.equals(uri.getScheme())) {
String email = 
uri.getSchemeSpecificPart();
 
Role role = 
attendee.getParameter(Role.CHAIR.getName());
@@ -439,14 +441,14 @@ public class IcalUtils {
 
   

[openmeetings] branch master updated: [OPENMEETINGS-2480] appointment invitation links are fixed

2020-10-15 Thread solomax
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 00fd257  [OPENMEETINGS-2480] appointment invitation links are fixed
00fd257 is described below

commit 00fd25771ba428035eaea83645f5d8c5386143ab
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 18:48:08 2020 +0700

[OPENMEETINGS-2480] appointment invitation links are fixed
---
 .../db/dao/calendar/AppointmentDao.java | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 10c91dc..474df5d 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -99,11 +99,19 @@ public class AppointmentDao implements 
IDataProviderDao{

r.setCapacity(cfgDao.getLong(CONFIG_CALENDAR_ROOM_CAPACITY, 50L));
}
a.setRoom(roomDao.update(r, userId));
+   final boolean newApp = a.getId() == null;
+   if (newApp) {
+   a.setInserted(new Date());
+   em.persist(a);
+   } else {
+   a.setUpdated(new Date());
+   a = em.merge(a);
+   }
if (sendmails) {
-   Set mmIds = a.getId() == null ? new HashSet<>()
+   Set mmIds = newApp ? new HashSet<>()
: 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
-   Appointment a0 = a.getId() == null ? null : 
get(a.getId());
+   Appointment a0 = newApp ? null : get(a.getId());
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
!(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
@@ -126,7 +134,7 @@ public class AppointmentDao implements 
IDataProviderDao{
//notify owner
MeetingMember owner = new MeetingMember();
owner.setUser(a.getOwner());
-   if (a.getId() == null) {
+   if (newApp) {
invitationManager.processInvitation(a, owner, 
MessageType.CREATE);
} else if (a.isDeleted()) {
invitationManager.processInvitation(a, owner, 
MessageType.CANCEL);
@@ -134,13 +142,6 @@ public class AppointmentDao implements 
IDataProviderDao{
invitationManager.processInvitation(a, owner, 
MessageType.UPDATE, sendMail);
}
}
-   if (a.getId() == null) {
-   a.setInserted(new Date());
-   em.persist(a);
-   } else {
-   a.setUpdated(new Date());
-   a = em.merge(a);
-   }
return a;
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2480] appointment invitation links are fixed

2020-10-15 Thread solomax
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 00fd257  [OPENMEETINGS-2480] appointment invitation links are fixed
00fd257 is described below

commit 00fd25771ba428035eaea83645f5d8c5386143ab
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 18:48:08 2020 +0700

[OPENMEETINGS-2480] appointment invitation links are fixed
---
 .../db/dao/calendar/AppointmentDao.java | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 10c91dc..474df5d 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -99,11 +99,19 @@ public class AppointmentDao implements 
IDataProviderDao{

r.setCapacity(cfgDao.getLong(CONFIG_CALENDAR_ROOM_CAPACITY, 50L));
}
a.setRoom(roomDao.update(r, userId));
+   final boolean newApp = a.getId() == null;
+   if (newApp) {
+   a.setInserted(new Date());
+   em.persist(a);
+   } else {
+   a.setUpdated(new Date());
+   a = em.merge(a);
+   }
if (sendmails) {
-   Set mmIds = a.getId() == null ? new HashSet<>()
+   Set mmIds = newApp ? new HashSet<>()
: 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
-   Appointment a0 = a.getId() == null ? null : 
get(a.getId());
+   Appointment a0 = newApp ? null : get(a.getId());
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
!(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
@@ -126,7 +134,7 @@ public class AppointmentDao implements 
IDataProviderDao{
//notify owner
MeetingMember owner = new MeetingMember();
owner.setUser(a.getOwner());
-   if (a.getId() == null) {
+   if (newApp) {
invitationManager.processInvitation(a, owner, 
MessageType.CREATE);
} else if (a.isDeleted()) {
invitationManager.processInvitation(a, owner, 
MessageType.CANCEL);
@@ -134,13 +142,6 @@ public class AppointmentDao implements 
IDataProviderDao{
invitationManager.processInvitation(a, owner, 
MessageType.UPDATE, sendMail);
}
}
-   if (a.getId() == null) {
-   a.setInserted(new Date());
-   em.persist(a);
-   } else {
-   a.setUpdated(new Date());
-   a = em.merge(a);
-   }
return a;
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2480] appointment invitation links are fixed

2020-10-15 Thread solomax
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 00fd257  [OPENMEETINGS-2480] appointment invitation links are fixed
00fd257 is described below

commit 00fd25771ba428035eaea83645f5d8c5386143ab
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 18:48:08 2020 +0700

[OPENMEETINGS-2480] appointment invitation links are fixed
---
 .../db/dao/calendar/AppointmentDao.java | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 10c91dc..474df5d 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -99,11 +99,19 @@ public class AppointmentDao implements 
IDataProviderDao{

r.setCapacity(cfgDao.getLong(CONFIG_CALENDAR_ROOM_CAPACITY, 50L));
}
a.setRoom(roomDao.update(r, userId));
+   final boolean newApp = a.getId() == null;
+   if (newApp) {
+   a.setInserted(new Date());
+   em.persist(a);
+   } else {
+   a.setUpdated(new Date());
+   a = em.merge(a);
+   }
if (sendmails) {
-   Set mmIds = a.getId() == null ? new HashSet<>()
+   Set mmIds = newApp ? new HashSet<>()
: 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
-   Appointment a0 = a.getId() == null ? null : 
get(a.getId());
+   Appointment a0 = newApp ? null : get(a.getId());
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
!(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
@@ -126,7 +134,7 @@ public class AppointmentDao implements 
IDataProviderDao{
//notify owner
MeetingMember owner = new MeetingMember();
owner.setUser(a.getOwner());
-   if (a.getId() == null) {
+   if (newApp) {
invitationManager.processInvitation(a, owner, 
MessageType.CREATE);
} else if (a.isDeleted()) {
invitationManager.processInvitation(a, owner, 
MessageType.CANCEL);
@@ -134,13 +142,6 @@ public class AppointmentDao implements 
IDataProviderDao{
invitationManager.processInvitation(a, owner, 
MessageType.UPDATE, sendMail);
}
}
-   if (a.getId() == null) {
-   a.setInserted(new Date());
-   em.persist(a);
-   } else {
-   a.setUpdated(new Date());
-   a = em.merge(a);
-   }
return a;
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2480] appointment invitation links are fixed

2020-10-15 Thread solomax
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 00fd257  [OPENMEETINGS-2480] appointment invitation links are fixed
00fd257 is described below

commit 00fd25771ba428035eaea83645f5d8c5386143ab
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 18:48:08 2020 +0700

[OPENMEETINGS-2480] appointment invitation links are fixed
---
 .../db/dao/calendar/AppointmentDao.java | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 10c91dc..474df5d 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -99,11 +99,19 @@ public class AppointmentDao implements 
IDataProviderDao{

r.setCapacity(cfgDao.getLong(CONFIG_CALENDAR_ROOM_CAPACITY, 50L));
}
a.setRoom(roomDao.update(r, userId));
+   final boolean newApp = a.getId() == null;
+   if (newApp) {
+   a.setInserted(new Date());
+   em.persist(a);
+   } else {
+   a.setUpdated(new Date());
+   a = em.merge(a);
+   }
if (sendmails) {
-   Set mmIds = a.getId() == null ? new HashSet<>()
+   Set mmIds = newApp ? new HashSet<>()
: 
meetingMemberDao.getMeetingMemberIdsByAppointment(a.getId());
// update meeting members
-   Appointment a0 = a.getId() == null ? null : 
get(a.getId());
+   Appointment a0 = newApp ? null : get(a.getId());
boolean sendMail = a0 == null || 
!a0.getTitle().equals(a.getTitle()) ||
!(a0.getDescription() != null ? 
a0.getDescription().equals(a.getDescription()) : true) ||
!(a0.getLocation() != null ? 
a0.getLocation().equals(a.getLocation()) : true) ||
@@ -126,7 +134,7 @@ public class AppointmentDao implements 
IDataProviderDao{
//notify owner
MeetingMember owner = new MeetingMember();
owner.setUser(a.getOwner());
-   if (a.getId() == null) {
+   if (newApp) {
invitationManager.processInvitation(a, owner, 
MessageType.CREATE);
} else if (a.isDeleted()) {
invitationManager.processInvitation(a, owner, 
MessageType.CANCEL);
@@ -134,13 +142,6 @@ public class AppointmentDao implements 
IDataProviderDao{
invitationManager.processInvitation(a, owner, 
MessageType.UPDATE, sendMail);
}
}
-   if (a.getId() == null) {
-   a.setInserted(new Date());
-   em.persist(a);
-   } else {
-   a.setUpdated(new Date());
-   a = em.merge(a);
-   }
return a;
}
 



[openmeetings] branch master updated: [OPENMEETINGS-2482] GeneralConfiguration page is refactored

2020-10-14 Thread solomax
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 a764669  [OPENMEETINGS-2482] GeneralConfiguration page is refactored
a764669 is described below

commit a76466949046e2d4e9fb61cc003d2cae91630719
Author: Maxim Solodovnik 
AuthorDate: Thu Oct 15 11:35:44 2020 +0700

[OPENMEETINGS-2482] GeneralConfiguration page is refactored
---
 .../src/site/resources/css/site.css|  3 ++
 .../src/site/stylesheets/configs.xsl   | 32 --
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/openmeetings-server/src/site/resources/css/site.css 
b/openmeetings-server/src/site/resources/css/site.css
index 29052c3..e8f6de2 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -121,3 +121,6 @@ iframe {
font-weight: bold;
color: var(--info);
 }
+.grid-striped .row:nth-of-type(odd) {
+   background-color: rgba(0,0,0,.05);
+}
diff --git a/openmeetings-server/src/site/stylesheets/configs.xsl 
b/openmeetings-server/src/site/stylesheets/configs.xsl
index e66fc69..10dfb3b 100644
--- a/openmeetings-server/src/site/stylesheets/configs.xsl
+++ b/openmeetings-server/src/site/stylesheets/configs.xsl
@@ -40,26 +40,30 @@
configuration values.


-   
-   
-key 
-default 
-meaning 
-availabe since OpenMeetings 
version 
-   
+   
+   
+# 
+key 

+type 
+
default 
+
meaning 
+version 
+   

-   
+   


 

 

-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
+   
+   
+   
+   

 



[openmeetings] branch master updated: [OPENMEETINGS-2478] sonar should be more happy

2020-10-14 Thread solomax
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 1c14c66  [OPENMEETINGS-2478] sonar should be more happy
1c14c66 is described below

commit 1c14c6683bcea29c9621c0b9d9204e0b0ec29575
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 20:53:24 2020 +0700

[OPENMEETINGS-2478] sonar should be more happy
---
 .../apache/openmeetings/core/remote/KStream.java   | 36 ++
 .../apache/openmeetings/backup/BackupImport.java   |  6 ++--
 .../apache/openmeetings/web/common/BasePanel.java  |  4 +++
 .../apache/openmeetings/web/common/MainPanel.java  |  2 +-
 .../openmeetings/web/common/menu/OmMenuItem.java   |  1 +
 .../web/common/tree/FileTreePanel.java |  4 +++
 .../web/common/tree/OmTreeProvider.java|  4 ++-
 .../sidebar/RoomFileUploadResourceReference.java   |  2 +-
 .../openmeetings/web/user/MessageDialog.java   |  2 +-
 9 files changed, 35 insertions(+), 26 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 77a5e2d..754ee15 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
@@ -48,6 +48,7 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
 import org.apache.openmeetings.db.util.ws.TextRoomMessage;
 import org.kurento.client.Continuation;
 import org.kurento.client.IceCandidate;
+import org.kurento.client.MediaFlowState;
 import org.kurento.client.MediaProfileSpecType;
 import org.kurento.client.MediaType;
 import org.kurento.client.RecorderEndpoint;
@@ -122,25 +123,22 @@ public class KStream extends AbstractStream {
outgoingMedia.addMediaSessionTerminatedListener(evt -> 
log.warn("Media stream terminated {}", sd));
outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
log.info("Media Flow STATE :: {}, type {}, evt {}", 
evt.getState(), evt.getType(), evt.getMediaType());
-   switch (evt.getState()) {
-   case NOT_FLOWING:
-   log.warn("FlowOut Future is created");
-   flowoutFuture = Optional.of(new 
CompletableFuture<>().completeAsync(() -> {
-   log.warn("KStream will be 
dropped {}", sd);
-   if (StreamType.SCREEN == 
streamType) {
-   
processor.doStopSharing(sid, uid);
-   }
-   stopBroadcast();
-   return null;
-   }, delayedExecutor(getFlowoutTimeout(), 
TimeUnit.SECONDS)));
-   break;
-   case FLOWING:
-   flowoutFuture.ifPresent(f -> {
-   log.warn("FlowOut Future is 
canceled");
-   f.cancel(true);
-   flowoutFuture = 
Optional.empty();
-   });
-   break;
+   if (MediaFlowState.NOT_FLOWING == evt.getState()) {
+   log.warn("FlowOut Future is created");
+   flowoutFuture = Optional.of(new 
CompletableFuture<>().completeAsync(() -> {
+   log.warn("KStream will be dropped {}", 
sd);
+   if (StreamType.SCREEN == streamType) {
+   processor.doStopSharing(sid, 
uid);
+   }
+   stopBroadcast();
+   return null;
+   }, delayedExecutor(getFlowoutTimeout(), 
TimeUnit.SECONDS)));
+   } else {
+   flowoutFuture.ifPresent(f -> {
+   log.warn("FlowOut Future is canceled");
+   f.cancel(true);
+   flowoutFuture = Optional.empty();
+   });
}
});
outgoingMedia.addMediaFlowInStateChangeListener(evt -> 
log.warn("Media FlowIn :: {}"

[openmeetings] branch master updated: [OPENMEETINGS-2478] sonar should be more happy

2020-10-14 Thread solomax
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 1c14c66  [OPENMEETINGS-2478] sonar should be more happy
1c14c66 is described below

commit 1c14c6683bcea29c9621c0b9d9204e0b0ec29575
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 20:53:24 2020 +0700

[OPENMEETINGS-2478] sonar should be more happy
---
 .../apache/openmeetings/core/remote/KStream.java   | 36 ++
 .../apache/openmeetings/backup/BackupImport.java   |  6 ++--
 .../apache/openmeetings/web/common/BasePanel.java  |  4 +++
 .../apache/openmeetings/web/common/MainPanel.java  |  2 +-
 .../openmeetings/web/common/menu/OmMenuItem.java   |  1 +
 .../web/common/tree/FileTreePanel.java |  4 +++
 .../web/common/tree/OmTreeProvider.java|  4 ++-
 .../sidebar/RoomFileUploadResourceReference.java   |  2 +-
 .../openmeetings/web/user/MessageDialog.java   |  2 +-
 9 files changed, 35 insertions(+), 26 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 77a5e2d..754ee15 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
@@ -48,6 +48,7 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
 import org.apache.openmeetings.db.util.ws.TextRoomMessage;
 import org.kurento.client.Continuation;
 import org.kurento.client.IceCandidate;
+import org.kurento.client.MediaFlowState;
 import org.kurento.client.MediaProfileSpecType;
 import org.kurento.client.MediaType;
 import org.kurento.client.RecorderEndpoint;
@@ -122,25 +123,22 @@ public class KStream extends AbstractStream {
outgoingMedia.addMediaSessionTerminatedListener(evt -> 
log.warn("Media stream terminated {}", sd));
outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
log.info("Media Flow STATE :: {}, type {}, evt {}", 
evt.getState(), evt.getType(), evt.getMediaType());
-   switch (evt.getState()) {
-   case NOT_FLOWING:
-   log.warn("FlowOut Future is created");
-   flowoutFuture = Optional.of(new 
CompletableFuture<>().completeAsync(() -> {
-   log.warn("KStream will be 
dropped {}", sd);
-   if (StreamType.SCREEN == 
streamType) {
-   
processor.doStopSharing(sid, uid);
-   }
-   stopBroadcast();
-   return null;
-   }, delayedExecutor(getFlowoutTimeout(), 
TimeUnit.SECONDS)));
-   break;
-   case FLOWING:
-   flowoutFuture.ifPresent(f -> {
-   log.warn("FlowOut Future is 
canceled");
-   f.cancel(true);
-   flowoutFuture = 
Optional.empty();
-   });
-   break;
+   if (MediaFlowState.NOT_FLOWING == evt.getState()) {
+   log.warn("FlowOut Future is created");
+   flowoutFuture = Optional.of(new 
CompletableFuture<>().completeAsync(() -> {
+   log.warn("KStream will be dropped {}", 
sd);
+   if (StreamType.SCREEN == streamType) {
+   processor.doStopSharing(sid, 
uid);
+   }
+   stopBroadcast();
+   return null;
+   }, delayedExecutor(getFlowoutTimeout(), 
TimeUnit.SECONDS)));
+   } else {
+   flowoutFuture.ifPresent(f -> {
+   log.warn("FlowOut Future is canceled");
+   f.cancel(true);
+   flowoutFuture = Optional.empty();
+   });
}
});
outgoingMedia.addMediaFlowInStateChangeListener(evt -> 
log.warn("Media FlowIn :: {}"

[openmeetings] branch master updated: [OPENMEETINGS-2239] some sonar issues

2020-10-14 Thread solomax
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 ef105b6  [OPENMEETINGS-2239] some sonar issues
ef105b6 is described below

commit ef105b6704146b81bf702451d7f8652f97a82ed1
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 20:09:28 2020 +0700

[OPENMEETINGS-2239] some sonar issues
---
 .../main/java/org/apache/openmeetings/db/dao/room/SipDao.java| 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
index c41fdc6..5f8b2f5 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
@@ -89,7 +89,7 @@ public class SipDao implements SipListenerExt {
public static final String SIP_FIRST_NAME = "SIP Transport";
public static final String SIP_USER_NAME = "--SIP--";
private static final String SIP_TRANSPORT = "ws";
-   private static final  Consumer NOOP() {
+   private static final  Consumer noop() {
return t -> {};
}
 
@@ -100,7 +100,6 @@ public class SipDao implements SipListenerExt {
private String branch;
 
private SipProvider sipProvider;
-   private SipFactory sipFactory;
private SipStackExt sipStack;
private MessageFactory messageFactory;
private HeaderFactory headerFactory;
@@ -119,7 +118,7 @@ public class SipDao implements SipListenerExt {
, config.getManagerPort()
, config.getManagerUser()
, config.getManagerPass());
-   sipFactory = SipFactory.getInstance();
+   final SipFactory sipFactory = SipFactory.getInstance();
sipFactory.setPathName("gov.nist");
 
final Properties properties = new Properties();
@@ -356,7 +355,7 @@ public class SipDao implements SipListenerExt {
}
 
private Address createAddr(String user) {
-   return createAddr(user, config.getSipHostname(), NOOP());
+   return createAddr(user, config.getSipHostname(), noop());
}
 
private Address createAddr(String user, String host, Consumer 
cons) {
@@ -437,7 +436,7 @@ public class SipDao implements SipListenerExt {
sendRequest(
REGISTER
, config.getOmSipUser()
-   , NOOP()
+   , noop()
, req -> {
try {
addAllow(req);



[openmeetings] branch master updated: [OPENMEETINGS-2476] InterruptedException is re-thrown, internal error page is changed

2020-10-14 Thread solomax
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 bfdacc3  [OPENMEETINGS-2476] InterruptedException is re-thrown, 
internal error page is changed
bfdacc3 is described below

commit bfdacc3fdb6597eedf71f54248efca223893ca52
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 20:06:02 2020 +0700

[OPENMEETINGS-2476] InterruptedException is re-thrown, internal error page 
is changed
---
 .../apache/openmeetings/web/app/Application.java   |  4 ++
 .../web/app/Application.properties.xml |  2 +
 .../web/app/Application_ar.properties.xml  |  2 +
 .../web/app/Application_bg.properties.xml  |  2 +
 .../web/app/Application_bn.properties.xml  |  2 +
 .../web/app/Application_ca.properties.xml  |  2 +
 .../web/app/Application_cs.properties.xml  |  2 +
 .../web/app/Application_da.properties.xml  |  2 +
 .../web/app/Application_de.properties.xml  |  2 +
 .../web/app/Application_el.properties.xml  |  2 +
 .../web/app/Application_es.properties.xml  |  2 +
 .../web/app/Application_fa.properties.xml  |  2 +
 .../web/app/Application_fi.properties.xml  |  2 +
 .../web/app/Application_fr.properties.xml  |  2 +
 .../web/app/Application_gl.properties.xml  |  2 +
 .../web/app/Application_hi.properties.xml  |  2 +
 .../web/app/Application_hu.properties.xml  |  2 +
 .../web/app/Application_in.properties.xml  |  2 +
 .../web/app/Application_it.properties.xml  |  2 +
 .../web/app/Application_iw.properties.xml  |  2 +
 .../web/app/Application_ja.properties.xml  |  2 +
 .../web/app/Application_ko.properties.xml  |  2 +
 .../web/app/Application_lo.properties.xml  |  2 +
 .../web/app/Application_nl.properties.xml  |  2 +
 .../web/app/Application_pl.properties.xml  |  2 +
 .../web/app/Application_pt.properties.xml  |  2 +
 .../web/app/Application_pt_BR.properties.xml   |  2 +
 .../web/app/Application_ru.properties.xml  |  2 +
 .../web/app/Application_sk.properties.xml  |  2 +
 .../web/app/Application_sv.properties.xml  |  2 +
 .../web/app/Application_ta.properties.xml  |  2 +
 .../web/app/Application_th.properties.xml  |  2 +
 .../web/app/Application_tr.properties.xml  |  2 +
 .../web/app/Application_uk.properties.xml  |  2 +
 .../web/app/Application_zh_CN.properties.xml   |  2 +
 .../web/app/Application_zh_TW.properties.xml   |  2 +
 .../openmeetings/web/pages/InternalErrorPage.html  | 36 +++
 .../openmeetings/web/pages/InternalErrorPage.java  | 52 ++
 .../openmeetings/web/pages/auth/SignInPage.java|  6 +--
 39 files changed, 165 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 87b2a85..ac4c389 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -68,6 +68,7 @@ import org.apache.openmeetings.util.ws.IClusterWsMessage;
 import org.apache.openmeetings.web.pages.AccessDeniedPage;
 import org.apache.openmeetings.web.pages.ActivatePage;
 import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.openmeetings.web.pages.InternalErrorPage;
 import org.apache.openmeetings.web.pages.MainPage;
 import org.apache.openmeetings.web.pages.NotInitedPage;
 import org.apache.openmeetings.web.pages.PrivacyPage;
@@ -118,6 +119,7 @@ import org.apache.wicket.request.http.WebResponse;
 import org.apache.wicket.request.mapper.info.PageComponentInfo;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.apache.wicket.settings.ExceptionSettings;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 import org.apache.wicket.util.string.Strings;
 import org.apache.wicket.validation.validator.UrlValidator;
@@ -189,6 +191,8 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
setWicketApplicationName(super.getName());
getSecuritySettings().setAuthenticationStrategy(new 
OmAuthenticationStrategy());

getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
+   
getApplicationSettings().setInternalErrorPage(InternalErrorPage.class);
+   
getExceptionSettings().setUnexpectedExceptionDisplay(ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE);
getComponentInstantiationListeners().add(new 
SpringComponentInjector(this, ctx

[openmeetings] branch master updated: [OPENMEETINGS-2465] invitation should be re-checked each time in session

2020-10-14 Thread solomax
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 fd3a6b1  [OPENMEETINGS-2465] invitation should be re-checked each time 
in session
fd3a6b1 is described below

commit fd3a6b176a4e91ce0d4fd3931b67c48325b8f11c
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 19:30:37 2020 +0700

[OPENMEETINGS-2465] invitation should be re-checked each time in session
---
 .../apache/openmeetings/web/app/WebSession.java| 35 --
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index c56386c..9197201 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -114,7 +114,7 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
private FastDateFormat iso8601Format = null;
private FastDateFormat  sdf = null;
private UserDashboard dashboard;
-   private Invitation i = null;
+   private Invitation invitation = null;
private SOAPLogin soap = null;
private Long roomId = null;
private Long recordingId = null;
@@ -153,7 +153,7 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
iso8601Format = null;
sdf = null;
languageId = -1;
-   i = null;
+   invitation = null;
soap = null;
roomId = null;
recordingId = null;
@@ -219,8 +219,8 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
}
}
 
-   public void checkHashes(StringValue secure, StringValue invitation) {
-   log.debug("checkHashes, secure: '{}', invitation: '{}'", 
secure, invitation);
+   public void checkHashes(StringValue secure, StringValue inviteStr) {
+   log.debug("checkHashes, secure: '{}', invitation: '{}'", 
secure, inviteStr);
try {
log.debug("checkHashes, has soap in session ? '{}'", 
(soap != null));
if (!secure.isEmpty() && (soap == null || 
!soap.getHash().equals(secure.toString( {
@@ -231,29 +231,32 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
}
signIn(secure.toString(), true);
}
-   if (!invitation.isEmpty() && (i == null || 
!i.getHash().equals(invitation.toString( {
+   if (!inviteStr.isEmpty()) {
+   // invitation should be re-checked each time, 
due to PERIOD invitation can be
+   // 1) not ready
+   // 2) already expired
// otherwise already logged-in with the same 
hash
if (isSignedIn()) {
log.debug("invitation: Session is 
authorized, going to invalidate");
invalidateNow();
}
-   i = inviteDao.getByHash(invitation.toString(), 
false);
+   invitation = 
inviteDao.getByHash(inviteStr.toString(), false);
Room r = null;
-   if (i != null && i.isAllowEntry()) {
+   if (invitation != null && 
invitation.isAllowEntry()) {
Set hrights = new HashSet<>();
-   if (i.getRoom() != null) {
-   r = i.getRoom();
-   } else if (i.getAppointment() != null 
&& i.getAppointment().getRoom() != null) {
-   r = 
i.getAppointment().getRoom();
-   } else if (i.getRecording() != null) {
-   recordingId = 
i.getRecording().getId();
+   if (invitation.getRoom() != null) {
+   r = invitation.getRoom();
+   } else if (invitation.getAppointment() 
!= null && invitation.getAppointment().getRoom() != null) {
+   r = 
invitation.getAppointment().ge

[openmeetings] branch master updated: [OPENMEETINGS-2465] meeting room is available few minutes before start for OM internal users

2020-10-13 Thread solomax
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 af35377  [OPENMEETINGS-2465] meeting room is available few minutes 
before start for OM internal users
af35377 is described below

commit af35377abfe90e2e682f2bf2eca166bdbb058e03
Author: Maxim Solodovnik 
AuthorDate: Wed Oct 14 00:06:31 2020 +0700

[OPENMEETINGS-2465] meeting room is available few minutes before start for 
OM internal users
---
 .../db/dao/basic/ConfigurationDao.java | 58 ++
 .../db/entity/calendar/Appointment.java|  5 ++
 .../apache/openmeetings/db/entity/user/User.java   |  6 ++-
 .../installation/ImportInitvalues.java |  8 ++-
 .../service/calendar/AppointmentLogic.java |  8 +--
 .../service/room/InvitationManager.java| 13 ++---
 .../openmeetings/util/OpenmeetingsVariables.java   | 20 +++-
 .../apache/openmeetings/web/room/RoomPanel.java|  3 +-
 8 files changed, 61 insertions(+), 60 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 273ce5f..3561fdb 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -287,19 +287,11 @@ public class ConfigurationDao implements 
IDataProviderDao {
reloadRestAllowOrigin();
break;
case CONFIG_LOGIN_MIN_LENGTH:
-   reloadLoginMinLength();
-   break;
case CONFIG_PASS_MIN_LENGTH:
-   reloadPasswdMinLength();
-   break;
case CONFIG_PASS_CHECK_UPPER:
-   reloadPwdCheckUpper();
-   break;
case CONFIG_PASS_CHECK_DIGIT:
-   reloadPwdCheckDigit();
-   break;
case CONFIG_PASS_CHECK_SPECIAL:
-   reloadPwdCheckSpecial();
+   reloadLoginPassword();
break;
case CONFIG_DEFAULT_GROUP_ID:
reloadDefaultGroup();
@@ -317,13 +309,9 @@ public class ConfigurationDao implements 
IDataProviderDao {
reloadChatSendOnEnter();
break;
case CONFIG_REGISTER_FRONTEND:
-   reloadAllowRegisterFront();
-   break;
case CONFIG_REGISTER_SOAP:
-   reloadAllowRegisterSoap();
-   break;
case CONFIG_REGISTER_OAUTH:
-   reloadAllowRegisterOauth();
+   reloadRegister();
break;
case CONFIG_EMAIL_VERIFICATION:
reloadSendVerificationEmail();
@@ -359,6 +347,10 @@ public class ConfigurationDao implements 
IDataProviderDao {
case CONFIG_SMTP_TIMEOUT:
reloadMailSettings();
break;
+   case CONFIG_APPOINTMENT_REMINDER_MINUTES:
+   case CONFIG_APPOINTMENT_PRE_START_MINUTES:
+   reloadAppointmentSettings();
+   break;
}
return entity;
}
@@ -430,23 +422,11 @@ public class ConfigurationDao implements 
IDataProviderDao {
setRestAllowOrigin(getString(CONFIG_REST_ALLOW_ORIGIN, null));
}
 
-   private void reloadLoginMinLength() {
+   private void reloadLoginPassword() {
setMinLoginLength(getInt(CONFIG_LOGIN_MIN_LENGTH, 
USER_LOGIN_MINIMUM_LENGTH));
-   }
-
-   private void reloadPasswdMinLength() {
setMinPasswdLength(getInt(CONFIG_LOGIN_MIN_LENGTH, 
USER_PASSWORD_MINIMUM_LENGTH));
-   }
-
-   private void reloadPwdCheckUpper() {
setPwdCheckUpper(getBool(CONFIG_PASS_CHECK_UPPER, true));
-   }
-
-   private void reloadPwdCheckDigit() {
setPwdCheckDigit(getBool(CONFIG_PASS_CHECK_DIGIT, true));
-   }
-
-   private void reloadPwdCheckSpecial() {
setPwdCheckSpecial(getBool(CONFIG_PASS_CHECK_SPECIAL, true));
}
 
@@ -470,15 +450,9 @@ public class ConfigurationDao implements

[openmeetings-site] branch asf-site updated: no jira: more improvements to CallForLogo

2020-10-13 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 827814a  no jira: more improvements to CallForLogo
827814a is described below

commit 827814a02d494818eddd9495b973d65fb267e84d
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 20:59:49 2020 +0700

no jira: more improvements to CallForLogo
---
 CallForLogo.html | 15 ++-
 css/site.css | 12 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/CallForLogo.html b/CallForLogo.html
index 7a2a5ac..fa08286 100644
--- a/CallForLogo.html
+++ b/CallForLogo.html
@@ -3,7 +3,7 @@
 
   
 
 
 
@@ -214,7 +214,7 @@
 
 
 
-Last Published: 
2020-10-11
+Last Published: 
2020-10-13
 
 
  
@@ -223,10 +223,12 @@
   
   As you may know, Apache Openmeetings is part of the Apache Software 
Foundation, which is a non-profit organization. In order to celebrate The 
Apache Software Foundation's 15th Anniversary and promote the ASF's more than 
200 projects, Apache has launched an effort to get folks who use Apache 
projects to note that by including one or more of the newly-designed "Powered 
By Apache" logos on their websites, documentation, marketing materials, 
etc. Guidelines for use are available [...]
   Please send your logos and opinions to user@ 
mail list (you need to subscribe first) Thanks in advance :)  
+  
  
  
  Preview 
   
+   
   
  
  
@@ -522,15 +524,10 @@
$(window).scrollTop(0);
}
function applyLogoSmall() {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("");
-   pp.append(l);
-   }
+   var l = $('.powered-preview 
.powered-preview-logo');
var ib = 
$(this).closest('table').find('.logo-square');
l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
+   
$('#before-preview')[0].scrollIntoView();
}
document.addEventListener("DOMContentLoaded", 
function() {
$('.btn-logo-big').click(applyLogoBig);
diff --git a/css/site.css b/css/site.css
index 24a3a57..29052c3 100644
--- a/css/site.css
+++ b/css/site.css
@@ -33,7 +33,7 @@ iframe {
background-repeat: no-repeat;
background-image: url('../images/logos/pb.png');
background-position: 0 0;
-   background-size: 200px 200px;
+   background-size: 200px;
width: 200px;
height: 200px;
position: relative;
@@ -41,12 +41,12 @@ iframe {
 .powered-preview-logo {
background-repeat: no-repeat;
background-position: 0 0;
-   background-size: 70px 70px;
+   background-size: 130px;
position: absolute;
-   height: 70px;
-   width: 70px;
-   top: 65px;
-   left: 65px;
+   height: 130px;
+   width: 130px;
+   top: 37px;
+   left: 37px;
 }
 .example-image-link {
display: block;



[openmeetings-site] branch asf-site updated: no jira: more improvements to CallForLogo

2020-10-13 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 827814a  no jira: more improvements to CallForLogo
827814a is described below

commit 827814a02d494818eddd9495b973d65fb267e84d
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 20:59:49 2020 +0700

no jira: more improvements to CallForLogo
---
 CallForLogo.html | 15 ++-
 css/site.css | 12 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/CallForLogo.html b/CallForLogo.html
index 7a2a5ac..fa08286 100644
--- a/CallForLogo.html
+++ b/CallForLogo.html
@@ -3,7 +3,7 @@
 
   
 
 
 
@@ -214,7 +214,7 @@
 
 
 
-Last Published: 
2020-10-11
+Last Published: 
2020-10-13
 
 
  
@@ -223,10 +223,12 @@
   
   As you may know, Apache Openmeetings is part of the Apache Software 
Foundation, which is a non-profit organization. In order to celebrate The 
Apache Software Foundation's 15th Anniversary and promote the ASF's more than 
200 projects, Apache has launched an effort to get folks who use Apache 
projects to note that by including one or more of the newly-designed "Powered 
By Apache" logos on their websites, documentation, marketing materials, 
etc. Guidelines for use are available [...]
   Please send your logos and opinions to user@ 
mail list (you need to subscribe first) Thanks in advance :)  
+  
  
  
  Preview 
   
+   
   
  
  
@@ -522,15 +524,10 @@
$(window).scrollTop(0);
}
function applyLogoSmall() {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("");
-   pp.append(l);
-   }
+   var l = $('.powered-preview 
.powered-preview-logo');
var ib = 
$(this).closest('table').find('.logo-square');
l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
+   
$('#before-preview')[0].scrollIntoView();
}
document.addEventListener("DOMContentLoaded", 
function() {
$('.btn-logo-big').click(applyLogoBig);
diff --git a/css/site.css b/css/site.css
index 24a3a57..29052c3 100644
--- a/css/site.css
+++ b/css/site.css
@@ -33,7 +33,7 @@ iframe {
background-repeat: no-repeat;
background-image: url('../images/logos/pb.png');
background-position: 0 0;
-   background-size: 200px 200px;
+   background-size: 200px;
width: 200px;
height: 200px;
position: relative;
@@ -41,12 +41,12 @@ iframe {
 .powered-preview-logo {
background-repeat: no-repeat;
background-position: 0 0;
-   background-size: 70px 70px;
+   background-size: 130px;
position: absolute;
-   height: 70px;
-   width: 70px;
-   top: 65px;
-   left: 65px;
+   height: 130px;
+   width: 130px;
+   top: 37px;
+   left: 37px;
 }
 .example-image-link {
display: block;



[openmeetings-site] branch asf-site updated: no jira: more improvements to CallForLogo

2020-10-13 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 827814a  no jira: more improvements to CallForLogo
827814a is described below

commit 827814a02d494818eddd9495b973d65fb267e84d
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 20:59:49 2020 +0700

no jira: more improvements to CallForLogo
---
 CallForLogo.html | 15 ++-
 css/site.css | 12 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/CallForLogo.html b/CallForLogo.html
index 7a2a5ac..fa08286 100644
--- a/CallForLogo.html
+++ b/CallForLogo.html
@@ -3,7 +3,7 @@
 
   
 
 
 
@@ -214,7 +214,7 @@
 
 
 
-Last Published: 
2020-10-11
+Last Published: 
2020-10-13
 
 
  
@@ -223,10 +223,12 @@
   
   As you may know, Apache Openmeetings is part of the Apache Software 
Foundation, which is a non-profit organization. In order to celebrate The 
Apache Software Foundation's 15th Anniversary and promote the ASF's more than 
200 projects, Apache has launched an effort to get folks who use Apache 
projects to note that by including one or more of the newly-designed "Powered 
By Apache" logos on their websites, documentation, marketing materials, 
etc. Guidelines for use are available [...]
   Please send your logos and opinions to user@ 
mail list (you need to subscribe first) Thanks in advance :)  
+  
  
  
  Preview 
   
+   
   
  
  
@@ -522,15 +524,10 @@
$(window).scrollTop(0);
}
function applyLogoSmall() {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("");
-   pp.append(l);
-   }
+   var l = $('.powered-preview 
.powered-preview-logo');
var ib = 
$(this).closest('table').find('.logo-square');
l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
+   
$('#before-preview')[0].scrollIntoView();
}
document.addEventListener("DOMContentLoaded", 
function() {
$('.btn-logo-big').click(applyLogoBig);
diff --git a/css/site.css b/css/site.css
index 24a3a57..29052c3 100644
--- a/css/site.css
+++ b/css/site.css
@@ -33,7 +33,7 @@ iframe {
background-repeat: no-repeat;
background-image: url('../images/logos/pb.png');
background-position: 0 0;
-   background-size: 200px 200px;
+   background-size: 200px;
width: 200px;
height: 200px;
position: relative;
@@ -41,12 +41,12 @@ iframe {
 .powered-preview-logo {
background-repeat: no-repeat;
background-position: 0 0;
-   background-size: 70px 70px;
+   background-size: 130px;
position: absolute;
-   height: 70px;
-   width: 70px;
-   top: 65px;
-   left: 65px;
+   height: 130px;
+   width: 130px;
+   top: 37px;
+   left: 37px;
 }
 .example-image-link {
display: block;



[openmeetings] branch master updated: no jira: more improvements to CallForLogo

2020-10-13 Thread solomax
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 cb0a14a  no jira: more improvements to CallForLogo
cb0a14a is described below

commit cb0a14a57be53d1f2b47c132a007225f016cf7df
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 20:57:23 2020 +0700

no jira: more improvements to CallForLogo
---
 .../src/site/resources/css/site.css|  12 ++--
 .../site/resources/images/logos/logo_om_big1.png   | Bin 157386 -> 138025 bytes
 .../site/resources/images/logos/logo_om_small1.png | Bin 51232 -> 49733 bytes
 openmeetings-server/src/site/xdoc/CallForLogo.xml  |  11 ---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/openmeetings-server/src/site/resources/css/site.css 
b/openmeetings-server/src/site/resources/css/site.css
index 24a3a57..29052c3 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -33,7 +33,7 @@ iframe {
background-repeat: no-repeat;
background-image: url('../images/logos/pb.png');
background-position: 0 0;
-   background-size: 200px 200px;
+   background-size: 200px;
width: 200px;
height: 200px;
position: relative;
@@ -41,12 +41,12 @@ iframe {
 .powered-preview-logo {
background-repeat: no-repeat;
background-position: 0 0;
-   background-size: 70px 70px;
+   background-size: 130px;
position: absolute;
-   height: 70px;
-   width: 70px;
-   top: 65px;
-   left: 65px;
+   height: 130px;
+   width: 130px;
+   top: 37px;
+   left: 37px;
 }
 .example-image-link {
display: block;
diff --git 
a/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png 
b/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png
index 20c595e..a4c3129 100644
Binary files 
a/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png and 
b/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png differ
diff --git 
a/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png 
b/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png
index 7691c99..af1c022 100644
Binary files 
a/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png and 
b/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png differ
diff --git a/openmeetings-server/src/site/xdoc/CallForLogo.xml 
b/openmeetings-server/src/site/xdoc/CallForLogo.xml
index 2355443..7e37b94 100644
--- a/openmeetings-server/src/site/xdoc/CallForLogo.xml
+++ b/openmeetings-server/src/site/xdoc/CallForLogo.xml
@@ -37,9 +37,11 @@
Please send your logos and opinions to user@ mail list (you need to subscribe first)
Thanks in advance :)

+   



+   



@@ -310,15 +312,10 @@
$(window).scrollTop(0);
}
function applyLogoSmall() {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("");
-   pp.append(l);
-   }
+   var l = $('.powered-preview 
.powered-preview-logo');
var ib = 
$(this).closest('table').find('.logo-square');
l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
+   
$('#before-preview')[0].scrollIntoView();
}
document.addEventListener("DOMContentLoaded", 
function() {
$('.btn-logo-big').click(applyLogoBig);



[openmeetings-site] branch asf-site updated: logos are updated

2020-10-13 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ae16f60  logos are updated
ae16f60 is described below

commit ae16f603190c09602e564a52f6938eab7dec6c02
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 19:42:09 2020 +0700

logos are updated
---
 images/logos/logo_om_big1.png   | Bin 157386 -> 138025 bytes
 images/logos/logo_om_small1.png | Bin 51232 -> 49733 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/logos/logo_om_big1.png b/images/logos/logo_om_big1.png
index 20c595e..a4c3129 100644
Binary files a/images/logos/logo_om_big1.png and 
b/images/logos/logo_om_big1.png differ
diff --git a/images/logos/logo_om_small1.png b/images/logos/logo_om_small1.png
index 7691c99..af1c022 100644
Binary files a/images/logos/logo_om_small1.png and 
b/images/logos/logo_om_small1.png differ



[openmeetings-site] branch asf-site updated: logos are updated

2020-10-13 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new ae16f60  logos are updated
ae16f60 is described below

commit ae16f603190c09602e564a52f6938eab7dec6c02
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 19:42:09 2020 +0700

logos are updated
---
 images/logos/logo_om_big1.png   | Bin 157386 -> 138025 bytes
 images/logos/logo_om_small1.png | Bin 51232 -> 49733 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/images/logos/logo_om_big1.png b/images/logos/logo_om_big1.png
index 20c595e..a4c3129 100644
Binary files a/images/logos/logo_om_big1.png and 
b/images/logos/logo_om_big1.png differ
diff --git a/images/logos/logo_om_small1.png b/images/logos/logo_om_small1.png
index 7691c99..af1c022 100644
Binary files a/images/logos/logo_om_small1.png and 
b/images/logos/logo_om_small1.png differ



[openmeetings] branch master updated: [OPENMEETINGS-2476] HttpURLConnection is replaced with HttpClient

2020-10-12 Thread solomax
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 c64509a  [OPENMEETINGS-2476] HttpURLConnection is replaced with 
HttpClient
c64509a is described below

commit c64509a16cd061dca8800db9bcdaf384bdbf7ee0
Author: Maxim Solodovnik 
AuthorDate: Tue Oct 13 09:20:06 2020 +0700

[OPENMEETINGS-2476] HttpURLConnection is replaced with HttpClient
---
 .../openmeetings/db/dao/user/IUserManager.java |   3 -
 .../openmeetings/db/entity/server/OAuthServer.java |  17 +-
 .../openmeetings/web/admin/oauth/OAuthForm.java|   2 +-
 .../apache/openmeetings/web/app/Application.java   |   3 +
 .../apache/openmeetings/web/app/UserManager.java   | 216 +++-
 .../openmeetings/web/pages/auth/SignInDialog.java  |   2 +-
 .../openmeetings/web/pages/auth/SignInPage.java| 222 +
 .../web/app/TestUserManagerMocked.java |  58 --
 8 files changed, 279 insertions(+), 244 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
index 262b381..94d6aba 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java
@@ -18,11 +18,9 @@
  */
 package org.apache.openmeetings.db.dao.user;
 
-import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
 
-import org.apache.openmeetings.db.dto.user.OAuthUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.OmException;
 
@@ -35,7 +33,6 @@ public interface IUserManager {
Object registerUser(User u, String password, String hash) throws 
OmException, NoSuchAlgorithmException;
 
Long getLanguage(Locale loc);
-   User loginOAuth(OAuthUser user, long serverId) throws IOException, 
NoSuchAlgorithmException;
 
boolean kickExternal(Long roomId, String externalType, String 
externalId);
boolean kickUsersByRoomId(Long roomId);
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
index 24285f8..d223706 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/OAuthServer.java
@@ -58,6 +58,14 @@ import org.apache.openmeetings.db.entity.HistoricalEntity;
 public class OAuthServer extends HistoricalEntity {
private static final long serialVersionUID = 1L;
 
+   public enum RequestTokenMethod {
+   POST, GET
+   }
+
+   public enum RequestInfoMethod {
+   POST, GET, HEADER
+   }
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
@@ -116,7 +124,6 @@ public class OAuthServer extends HistoricalEntity {
@MapKeyColumn(name = "name")
@Column(name = "value")
@CollectionTable(name = "oauth_mapping", joinColumns = @JoinColumn(name 
= "oauth_id"))
-   //FIXME TODO @XmlElement(name = "attrMapping", required = false)
@XmlTransient
private Map mapping = new LinkedHashMap<>();
 
@@ -263,12 +270,4 @@ public class OAuthServer extends HistoricalEntity {
.append(", isDeleted()=").append(isDeleted())
.append("]").toString();
}
-
-   public enum RequestTokenMethod {
-   POST, GET
-   }
-
-   public enum RequestInfoMethod {
-   POST, GET, HEADER
-   }
 }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index 7ad488a..61ac9bb 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -18,9 +18,9 @@
  */
 package org.apache.openmeetings.web.admin.oauth;
 
+import static org.apache.openmeetings.web.app.UserManager.getRedirectUri;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 import static 
org.apache.openmeetings.web.common.confirmation.ConfirmationBehavior.newOkCancelDangerConfirm;
-import static org.apache.openmeetings.web.pages.auth.SignInPage.getRedirectUri;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetin

[openmeetings] branch master updated: [OPENMEETINGS-2455] tomcat

2020-10-12 Thread solomax
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 d8a8c06  [OPENMEETINGS-2455] tomcat
d8a8c06 is described below

commit d8a8c066e5c41859f7c5d49afdcad028a7ad6913
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 12 17:07:33 2020 +0700

[OPENMEETINGS-2455] tomcat
---
 openmeetings-server/pom.xml | 2 +-
 pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 43a9f42..655dd7c 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -118,7 +118,7 @@
prepare-web-server


-   
web-server/apache-tomcat-9.0.38.tar.gz 
+   
web-server/apache-tomcat-9.0.39.tar.gz 



diff --git a/pom.xml b/pom.xml
index 46b8986..60b4cf4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
5.0.1
5.15.0
5.2.9.RELEASE
-   9.0.38
+   9.0.39
3.0.18
3.4.0
2.7.1



[openmeetings] branch master updated: [OPENMEETINGS-2239] initial commit, basic work with jain-sip

2020-10-12 Thread solomax
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 c44043a  [OPENMEETINGS-2239] initial commit, basic work with jain-sip
c44043a is described below

commit c44043a6d3a1dc34844d1ddd580c0569cb47adbf
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 12 13:31:39 2020 +0700

[OPENMEETINGS-2239] initial commit, basic work with jain-sip
---
 openmeetings-db/pom.xml|   4 +
 .../apache/openmeetings/db/dao/room/SipConfig.java | 123 
 .../apache/openmeetings/db/dao/room/SipDao.java| 339 +++--
 .../src/site/markdown/AsteriskIntegration.md   | 107 +--
 openmeetings-web/pom.xml   |   2 +-
 .../webapp/WEB-INF/classes/applicationContext.xml  |  24 +-
 6 files changed, 538 insertions(+), 61 deletions(-)

diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index ef733ec..cd6d82a 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -109,6 +109,10 @@
${mssql.version}


+   javax.sip
+   jain-sip-ri
+   
+   
org.apache.openmeetings
openmeetings-util
${project.version}
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipConfig.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipConfig.java
new file mode 100644
index 000..e1a5646
--- /dev/null
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipConfig.java
@@ -0,0 +1,123 @@
+/*
+ * 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.db.dao.room;
+
+public class SipConfig {
+   private String sipHostname;
+   private int managerPort;
+   private String managerUser;
+   private String managerPass;
+   private long managerTimeout;
+
+   private int localWsPort = ;
+   private String localWsHost;
+   private int wsPort;
+   private String omSipUser;
+   private String omSipPasswd;
+
+   private String uid; //FIXME TODO is this still required ?!
+
+   public String getSipHostname() {
+   return sipHostname;
+   }
+
+   public void setSipHostname(String sipHostname) {
+   this.sipHostname = sipHostname;
+   }
+
+   public int getManagerPort() {
+   return managerPort;
+   }
+
+   public void setManagerPort(int managerPort) {
+   this.managerPort = managerPort;
+   }
+
+   public String getManagerUser() {
+   return managerUser;
+   }
+
+   public void setManagerUser(String managerUser) {
+   this.managerUser = managerUser;
+   }
+
+   public String getManagerPass() {
+   return managerPass;
+   }
+
+   public void setManagerPass(String managerPass) {
+   this.managerPass = managerPass;
+   }
+
+   public long getManagerTimeout() {
+   return managerTimeout;
+   }
+
+   public void setManagerTimeout(long managerTimeout) {
+   this.managerTimeout = managerTimeout;
+   }
+
+   public int getLocalWsPort() {
+   return localWsPort;
+   }
+
+   public void setLocalWsPort(int localWsPort) {
+   this.localWsPort = localWsPort;
+   }
+
+   public String getLocalWsHost() {
+   return localWsHost;
+   }
+
+   public void setLocalWsHost(String localWsHost) {
+   this.localWsHost = localWsHost;
+   }
+
+   public int getWsPort() {
+   return wsPort;
+   }
+
+   public void setWsPort(int wsPort) {
+   this.wsPort = wsPort;
+   }
+
+   public String getOmSipUser() {
+   return omSipUser;
+   }
+
+   public void setOmSipUser(String omSipUser) {
+   this.omSipUser = omSipUser;
+   }
+
+   public S

[openmeetings] branch master updated: [OPENMEETINGS-2455] wicket, wicketstuff, wicket-jquiry-ui, font-awesome, postgres

2020-10-12 Thread solomax
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 f198df6  [OPENMEETINGS-2455] wicket, wicketstuff, wicket-jquiry-ui, 
font-awesome, postgres
f198df6 is described below

commit f198df63cbedbae231a829b697a9d9a244fe963d
Author: Maxim Solodovnik 
AuthorDate: Mon Oct 12 13:17:09 2020 +0700

[OPENMEETINGS-2455] wicket, wicketstuff, wicket-jquiry-ui, font-awesome, 
postgres
---
 pom.xml | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 376727f..46b8986 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,10 +76,11 @@

3.1.1

5.7.0
-   9.0.0
-   9.0.0-M5.1
-   9.0.0
+   9.1.0
+   9.0.0
+   9.1.0
5.0.1
+   5.15.0
5.2.9.RELEASE
9.0.38
3.0.18
@@ -95,7 +96,7 @@
3.8.0
2.8.0
2.9.0
-   42.2.16
+   42.2.17
1.4
2.1.3
1.15
@@ -116,6 +117,7 @@
3.5.13
2.3.2
6.14.0
+   1.2.307

file:**/generated-sources/**, 
file:**/jquery-ui.css, file:**/fabric.js, file:**/cssemoticons.js, 
file:**/adapter-latest.js, file:**/kurento-utils.js, file:**/NoSleep.js, 
file:**/fileinput*.js, file:**/MathJax.js, file:**/network.js
jacoco
@@ -647,6 +649,11 @@
${junit.version}
test

+   
+   javax.sip
+   jain-sip-ri
+   ${jain-sip.version}
+   






[openmeetings-site] branch asf-site updated: no jira: logo contribution

2020-10-11 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/openmeetings-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 277dad3  no jira: logo contribution
277dad3 is described below

commit 277dad372611e01584f9ec8d5cd1a5e134d9a334
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 11 14:41:03 2020 +0700

no jira: logo contribution
---
 CallForLogo.html| 114 +---
 images/logos/logo_om_big1.png   | Bin 0 -> 157386 bytes
 images/logos/logo_om_small1.png | Bin 0 -> 51232 bytes
 3 files changed, 72 insertions(+), 42 deletions(-)

diff --git a/CallForLogo.html b/CallForLogo.html
index a4d4951..7a2a5ac 100644
--- a/CallForLogo.html
+++ b/CallForLogo.html
@@ -3,7 +3,7 @@
 
   
 
 
 
@@ -214,7 +214,7 @@
 
 
 
-Last Published: 
2020-09-19
+Last Published: 
2020-10-11
 
 
  
@@ -231,27 +231,6 @@
  
  
  Logos 
- 
-//<![CDATA[
-   function applyLogoBig(e) {
-   var ib = 
e.closest('table').find('.logo-big');
-   var bi = $('.bannerLeft img');
-   bi.attr('src', ib.attr('src'));
-   $('.subhead')[0].scrollIntoView()
-   }
-   function applyLogoSmall(e) {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("<div 
class='powered-preview-logo'></div>");
-   pp.append(l);
-   }
-   var ib = 
e.closest('table').find('.logo-square');
-   l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
-   }
-   //]]>
- 
   
   Big version 

@@ -260,7 +239,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -273,7 +252,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -286,7 +265,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -299,7 +278,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -312,7 +291,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -325,7 +304,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -338,7 +317,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -351,7 +330,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -359,6 +338,19 @@

   
   
+
+ 
+  
+   
+
+   Apply 
+   
+   
+   Author 
+   Thomas Scholzen 
+   
+  
+  

   
   
@@ -369,7 +361,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -382,7 +374,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -395,7 +387,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -408,7 +400,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -421,7 +413,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -434,7 +426,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -447,7 +439,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -460,7 +452,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -473,7 +465,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -486,7 +478,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -499,7 +491,7 @@
   

 
-   Apply 
+   Apply 


Author 
@@ -507,7 +499,45 @@

   
   
+
+ 
+  
+   
+
+   Apply 
+   
+   
+   Author 
+   Thomas Scholzen 
+   
+  
+  

+  
+//<![CDATA[
+   function applyLogoBig() {
+   

[openmeetings] branch master updated: no jira: logo contribution

2020-10-11 Thread solomax
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 4c1fe77  no jira: logo contribution
4c1fe77 is described below

commit 4c1fe77783cca73266bee0320f5f9e05b31b488b
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 11 14:40:38 2020 +0700

no jira: logo contribution
---
 .../site/resources/images/logos/logo_om_big1.png   | Bin 0 -> 157386 bytes
 .../site/resources/images/logos/logo_om_small1.png | Bin 0 -> 51232 bytes
 openmeetings-server/src/site/xdoc/CallForLogo.xml  | 108 +
 3 files changed, 68 insertions(+), 40 deletions(-)

diff --git 
a/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png 
b/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png
new file mode 100644
index 000..20c595e
Binary files /dev/null and 
b/openmeetings-server/src/site/resources/images/logos/logo_om_big1.png differ
diff --git 
a/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png 
b/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png
new file mode 100644
index 000..7691c99
Binary files /dev/null and 
b/openmeetings-server/src/site/resources/images/logos/logo_om_small1.png differ
diff --git a/openmeetings-server/src/site/xdoc/CallForLogo.xml 
b/openmeetings-server/src/site/xdoc/CallForLogo.xml
index c27de83..2355443 100644
--- a/openmeetings-server/src/site/xdoc/CallForLogo.xml
+++ b/openmeetings-server/src/site/xdoc/CallForLogo.xml
@@ -43,34 +43,13 @@



-   
-   //<![CDATA[
-   function applyLogoBig(e) {
-   var ib = 
e.closest('table').find('.logo-big');
-   var bi = $('.bannerLeft img');
-   bi.attr('src', ib.attr('src'));
-   $('.subhead')[0].scrollIntoView()
-   }
-   function applyLogoSmall(e) {
-   var pp = $('.powered-preview');
-   var l = 
pp.children('.powered-preview-logo');
-   if (!l.length) {
-   l = $("<div 
class='powered-preview-logo'></div>");
-   pp.append(l);
-   }
-   var ib = 
e.closest('table').find('.logo-square');
-   l.css('background-image', 'url(' + 
ib.attr('src') + ')');
-   $('#_toc_preview')[0].scrollIntoView();
-   }
-   //]]>
-   
Big version





-   Apply
+   Apply


Author
@@ -82,7 +61,7 @@



-   Apply
+   Apply


Author
@@ -94,7 +73,7 @@



-   Apply
+   Apply


Author
@@ -106,7 +85,7 @@



-   Apply
+   Apply



[openmeetings] branch master updated: [OPENMEETINGS-2469] tests should produce less warnings and errors

2020-10-04 Thread solomax
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 8c55afd  [OPENMEETINGS-2469] tests should produce less warnings and 
errors
8c55afd is described below

commit 8c55afd7879e7871c3c8914ad1dfe22bec64b2c2
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 4 21:57:04 2020 +0700

[OPENMEETINGS-2469] tests should produce less warnings and errors
---
 .../main/java/org/apache/openmeetings/util/OMContextListener.java| 5 +
 pom.xml  | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
index 7c48225..aff5364 100644
--- 
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
+++ 
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
@@ -28,7 +28,6 @@ import org.slf4j.LoggerFactory;
 
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.joran.JoranConfigurator;
-import ch.qos.logback.core.util.StatusPrinter;
 
 public class OMContextListener implements ServletContextListener {
private static final String LOG_DIR_PROP = 
"current_openmeetings_log_dir";
@@ -62,10 +61,8 @@ public class OMContextListener implements 
ServletContextListener {
}
}
} catch (Exception e) {
-   e.printStackTrace();
-   // StatusPrinter will handle this
+   // no-op
}
-   StatusPrinter.printInCaseOfErrorsOrWarnings(context);
}
 
private static String pathToName(ServletContextEvent event) {
diff --git a/pom.xml b/pom.xml
index f390471..376727f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -896,6 +896,7 @@



+   --add-modules java.se 
--add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens 
java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED 
--add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens 
java.management/sun.management=ALL-UNNAMED --add-opens 
jdk.management/com.sun.management.internal=ALL-UNNAMED






[openmeetings] branch master updated: [OPENMEETINGS-2472] gtag should work

2020-10-03 Thread solomax
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 640c509  [OPENMEETINGS-2472] gtag should work
640c509 is described below

commit 640c50916a7b5c3da9c775597e0309887b3bc42d
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 4 12:57:53 2020 +0700

[OPENMEETINGS-2472] gtag should work
---
 .../java/org/apache/openmeetings/web/pages/om-ga.js   | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index 2e3068d..d1bd241 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,12 +1,25 @@
 /* Licensed under the Apache License, Version 2.0 (the "License") 
http://www.apache.org/licenses/LICENSE-2.0 */
 function initGA(code, hash) {
window.dataLayer = window.dataLayer || [];
-   const gtag = () => dataLayer.push(arguments)
-   , newPage = () => gtag('config', code, {'page_path': 
location.pathname + location.hash});
+   function gtag() {
+   dataLayer.push(arguments);
+   }
+   function newPage() {
+   const page = location.pathname + 
(location.search.indexOf('app=') > -1 ? location.search : location.hash);
+   gtag('config', code, {'page_path': page});
+   }
gtag('js', new Date());
 
+   gtag('config', code, {
+   anonymize_ip: true
+   , send_page_view: false
+   });
newPage();
if (hash) {
-   $(window).off('hashchange').on('hashchange', newPage);
+   $(window).off('hashchange').on('hashchange', () => {
+   if (location.hash.indexOf('/') > -1) {
+   newPage();
+   }
+   });
}
 }



[openmeetings] branch master updated: [OPENMEETINGS-2472] js improvements

2020-10-03 Thread solomax
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 0865e81  [OPENMEETINGS-2472] js improvements
0865e81 is described below

commit 0865e81e1a7bb24e107e883a7885d5b80a25d384
Author: Maxim Solodovnik 
AuthorDate: Sun Oct 4 11:30:38 2020 +0700

[OPENMEETINGS-2472] js improvements
---
 .../apache/openmeetings/web/pages/BasePage.java|  4 ++--
 .../org/apache/openmeetings/web/pages/om-ga.js | 22 --
 2 files changed, 10 insertions(+), 16 deletions(-)

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 dbb1010..0c993f0 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
@@ -140,8 +140,8 @@ public abstract class BasePage extends 
AsyncUrlFragmentAwarePage {
return 
List.of(JavaScriptHeaderItem.forUrl("https://www.googletagmanager.com/gtag/js?id=;
 + getGaCode()).setAsync(true));
}
})));
-   StringBuilder script = new StringBuilder("initGA('");
-   
script.append(getGaCode()).append("');").append(isMainPage() ? "initHash()" : 
"gtagEvent()").append(';');
+   StringBuilder script = new StringBuilder("initGA('")
+   .append(getGaCode()).append("', 
").append(isMainPage()).append(");");
response.render(OnDomReadyHeaderItem.forScript(script));
}

response.render(CssHeaderItem.forReference(FontAwesome5CssReference.instance()));
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
index b3d6f99..2e3068d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js
@@ -1,18 +1,12 @@
 /* Licensed under the Apache License, Version 2.0 (the "License") 
http://www.apache.org/licenses/LICENSE-2.0 */
-window.dataLayer = window.dataLayer || [];
-function gtag() {
-   dataLayer.push(arguments);
-}
-function gtagEvent() {
-   gtag('event', 'pageview', {page: location.pathname, hash: 
location.hash});
-}
-function initGA(code) {
+function initGA(code, hash) {
+   window.dataLayer = window.dataLayer || [];
+   const gtag = () => dataLayer.push(arguments)
+   , newPage = () => gtag('config', code, {'page_path': 
location.pathname + location.hash});
gtag('js', new Date());
 
-   gtag('config', code);
-}
-function initHash() {
-   gtagEvent();
-
-   $(window).off('hashchange').on('hashchange', gtagEvent);
+   newPage();
+   if (hash) {
+   $(window).off('hashchange').on('hashchange', newPage);
+   }
 }



  1   2   3   4   5   6   7   8   9   10   >