[jira] [Commented] (OPENMEETINGS-1636) Upgrade AppointmentManager from HttpClient 3.x to 4.x
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1636?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625320#comment-16625320 ] Ankush Mishra commented on OPENMEETINGS-1636: - I'll update the version on my fork, thanks for offering. > Upgrade AppointmentManager from HttpClient 3.x to 4.x > - > > Key: OPENMEETINGS-1636 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1636 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Calendar >Reporter: Ankush Mishra >Assignee: Ankush Mishra >Priority: Minor > > I had been waiting for > [JCR-2406|https://issues.apache.org/jira/browse/JCR-2406] to close. Since, > that has been completed for a couple of months, I opened another Issue for > CalDAV4j [here|https://github.com/caldav4j/caldav4j/issues/63] , which I will > try to first release to the Central Repo soon, with 3.x, after which I will > get to work on the migration. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625164#comment-16625164 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit 5c8f68d648414a604abb7f9f6f49e04192159341 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5c8f68d ] [OPENMEETINGS-1928] library versions are updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1928] library versions are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 5c8f68d [OPENMEETINGS-1928] library versions are updated
5c8f68d is described below
commit 5c8f68d648414a604abb7f9f6f49e04192159341
Author: Maxim Solodovnik
AuthorDate: Sun Sep 23 23:10:43 2018 +0700
[OPENMEETINGS-1928] library versions are updated
---
pom.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1b991d8..a726086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
3.1.0
3.1.0
3.1.1
- 3.5.1
+ 4.0.0
3.2.2
3.1.0
2.0.0
@@ -67,15 +67,15 @@
0.12
1.5
1.4
-
3.4.1.1168
+
3.5.0.1254
0.8.2
4.12
8.1.0
- 8.0.0
+ 8.1.0
8.1.0
1.0.10-M9
- 5.0.9.RELEASE
+ 5.1.0.RELEASE
2.0.19
9.0.12
3.0.1
@@ -86,7 +86,7 @@
${project.basedir}
false
10.14.2.0
- 3.8
+ 3.8.1
1.6.2
3.0.0
2.0.2
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625162#comment-16625162 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit 6dbc52b776fae0ddef4e191e51dfb8e8f4f087c2 in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6dbc52b ] [OPENMEETINGS-1928] library versions are updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] library versions are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 6dbc52b [OPENMEETINGS-1928] library versions are updated
6dbc52b is described below
commit 6dbc52b776fae0ddef4e191e51dfb8e8f4f087c2
Author: Maxim Solodovnik
AuthorDate: Sun Sep 23 23:10:43 2018 +0700
[OPENMEETINGS-1928] library versions are updated
---
pom.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c90f33..2ab7d21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
3.1.0
3.1.0
3.1.1
- 3.5.1
+ 4.0.0
3.2.2
3.1.0
2.0.0
@@ -67,16 +67,16 @@
0.12
1.5
1.4
-
3.4.1.1168
+
3.5.0.1254
0.8.2
4.12
8.1.0
- 8.0.0
+ 8.1.0
8.1.0
1.0.10-M9
1.0.10-M9
- 5.0.9.RELEASE
+ 5.1.0.RELEASE
2.0.19
9.0.12
3.0.1
@@ -87,7 +87,7 @@
${project.basedir}
false
10.14.2.0
- 3.8
+ 3.8.1
1.6.2
3.0.0
2.0.2
[jira] [Commented] (OPENMEETINGS-1636) Upgrade AppointmentManager from HttpClient 3.x to 4.x
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1636?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625158#comment-16625158 ] Maxim Solodovnik commented on OPENMEETINGS-1636: Great news can you update OM code? or should I handle it? > Upgrade AppointmentManager from HttpClient 3.x to 4.x > - > > Key: OPENMEETINGS-1636 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1636 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Calendar >Reporter: Ankush Mishra >Assignee: Ankush Mishra >Priority: Minor > > I had been waiting for > [JCR-2406|https://issues.apache.org/jira/browse/JCR-2406] to close. Since, > that has been completed for a couple of months, I opened another Issue for > CalDAV4j [here|https://github.com/caldav4j/caldav4j/issues/63] , which I will > try to first release to the Central Repo soon, with 3.x, after which I will > get to work on the migration. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1636) Upgrade AppointmentManager from HttpClient 3.x to 4.x
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1636?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625115#comment-16625115 ] Ankush Mishra commented on OPENMEETINGS-1636: - CalDAV versions, 0.9.2 and 1.0.0-rc.1 have been released to Maven central. Version 1.0.0 is what we are going to use for the upgrade. > Upgrade AppointmentManager from HttpClient 3.x to 4.x > - > > Key: OPENMEETINGS-1636 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1636 > Project: Openmeetings > Issue Type: Improvement > Components: HTML5/Calendar >Reporter: Ankush Mishra >Assignee: Ankush Mishra >Priority: Minor > > I had been waiting for > [JCR-2406|https://issues.apache.org/jira/browse/JCR-2406] to close. Since, > that has been completed for a couple of months, I opened another Issue for > CalDAV4j [here|https://github.com/caldav4j/caldav4j/issues/63] , which I will > try to first release to the Central Repo soon, with 3.x, after which I will > get to work on the migration. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] room video somehow work (not stable)
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 267da92 [OPENMEETINGS-1649] room video somehow work (not stable)
267da92 is described below
commit 267da9245a65326f519c889b974b4c6967bcdfde
Author: Maxim Solodovnik
AuthorDate: Sun Sep 23 18:52:32 2018 +0700
[OPENMEETINGS-1649] room video somehow work (not stable)
---
.../org/apache/openmeetings/core/remote/KRoom.java | 42 +-
.../apache/openmeetings/core/remote/KStream.java | 158 +
.../openmeetings/core/remote/KTestStream.java | 3 +-
.../openmeetings/core/remote/KurentoHandler.java | 127 -
.../openmeetings/core/util/WebSocketHelper.java| 15 ++
.../core/util/ws/WsMessageRoomOthers.java | 35 +
.../openmeetings/db/util/ws/RoomMessage.java | 2 -
.../apache/openmeetings/web/room/RoomPanel.java| 43 +-
.../openmeetings/web/room/raw-video-manager.js | 53 +--
.../org/apache/openmeetings/web/room/raw-video.js | 11 --
.../webapp/WEB-INF/classes/applicationContext.xml | 5 +-
11 files changed, 252 insertions(+), 242 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 f06e141..d4b1d77 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,9 +24,7 @@ package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.core.remote.KurentoHandler.newKurentoMsg;
import java.io.Closeable;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -66,53 +64,22 @@ public class KRoom implements Closeable {
log.info("ROOM {} has been created", roomId);
}
- public KStream addStream(final KurentoHandler h, StreamDesc sd) {
+ public KStream startBroadcast(final KurentoHandler h, Client c,
StreamDesc sd) {
log.info("ROOM {}: adding participant {}", roomId, sd.getUid());
- final KStream u = new KStream(h, sd.getSid(), sd.getUid(),
this.roomId, this.pipeline);
+ final KStream u = new KStream(h, c, this.pipeline);
participants.put(u.getUid(), u);
h.usersByUid.put(u.getUid(), u);
- return u;
- }
-
- public KStream join(final KurentoHandler h, Client c, StreamDesc sd) {
- KStream u = addStream(h, sd);
broadcast(h, c, sd);
return u;
}
- public void leave(final KurentoHandler h, KStream user) {
- log.debug("PARTICIPANT {}: Leaving room {}", user.getUid(),
this.roomId);
- this.removeParticipant(h, user.getUid());
- user.release();
- }
-
- private void removeParticipant(final KurentoHandler h, String name) {
- participants.remove(name);
-
- log.debug("ROOM {}: notifying all users that {} is leaving the
room", this.roomId, name);
-
- final List unnotifiedParticipants = new ArrayList<>();
- final JSONObject msg = newKurentoMsg();
- msg.put("id", "participantLeft");
- msg.put("name", name);
- for (final KStream participant : participants.values()) {
- participant.cancelVideoFrom(name);
- h.sendClient(participant.getSid(), msg);
- }
-
- if (!unnotifiedParticipants.isEmpty()) {
- log.debug("ROOM {}: The users {} could not be notified
that {} left the room", this.roomId,
- unnotifiedParticipants, name);
- }
- }
-
private static void broadcast(final KurentoHandler h, Client c,
StreamDesc sd) {
final JSONObject msg = newKurentoMsg();
msg.put("id", "broadcast");
msg.put("uid", sd.getUid());
msg.put("stream", new JSONObject(sd));
msg.put("client", c.toJson(true));
- log.debug("User {}: has started broadcast", sd.getSid());
+ log.debug("User {}: has started broadcast", sd.getUid());
h.sendClient(sd.getSid(), msg);
}
@@ -126,11 +93,8 @@ public class KRoom implements Closeable {
for (final KStream user : participants.values()) {
user.release();
}
-
participants.clear();
-
pipeline.release(new Continuation() {
-
@Override
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16625082#comment-16625082 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 267da9245a65326f519c889b974b4c6967bcdfde in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=267da92 ] [OPENMEETINGS-1649] room video somehow work (not stable) > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (OPENMEETINGS-1938) Import restores purged data
Aaron Hepp created OPENMEETINGS-1938: Summary: Import restores purged data Key: OPENMEETINGS-1938 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1938 Project: Openmeetings Issue Type: Bug Components: Import/Export Affects Versions: 4.0.5 Environment: Ubuntu 16.04VM Reporter: Aaron Hepp Assignee: Maxim Solodovnik When doing a back-up and a restore on a system, the import process is bringing purged data. Purged data should be excluded when import process is ran -- This message was sent by Atlassian JIRA (v7.6.3#76005)
