You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/04 08:57:33 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1715] room exit is fixed
once again
Repository: openmeetings
Updated Branches:
refs/heads/master 3ebbb1129 -> ad0a8251b
[OPENMEETINGS-1715] room exit is fixed once again
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/18b239bc
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/18b239bc
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/18b239bc
Branch: refs/heads/master
Commit: 18b239bc2238aa88187b8f34a63a735ecc19ffaf
Parents: 3ebbb11
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Oct 4 15:57:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Oct 4 15:57:15 2017 +0700
----------------------------------------------------------------------
.../core/remote/ScopeApplicationAdapter.java | 17 +++++++++++------
.../apache/openmeetings/web/app/Application.java | 1 +
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/18b239bc/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 14075ee..f53d1af 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -390,13 +390,8 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
}
}
- public void roomLeaveByScope(org.apache.openmeetings.db.entity.basic.IClient c, Long roomId) {
- StreamClient rcl = sessionManager.get(c.getUid());
+ public void dropSharing(org.apache.openmeetings.db.entity.basic.IClient c, Long roomId) {
IScope scope = getChildScope(String.valueOf(roomId));
- _log.debug("[roomLeaveByScope] {} {} {} {}", c.getUid(), roomId, rcl, scope);
- if (rcl != null && scope != null) {
- roomLeaveByScope(rcl, scope);
- }
//Elvis has left the building
new MessageSender(scope, "stopStream", new Object(), this) {
@Override
@@ -409,6 +404,16 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
}.start();
}
+ public void roomLeaveByScope(org.apache.openmeetings.db.entity.basic.IClient c, Long roomId) {
+ StreamClient rcl = sessionManager.get(c.getUid());
+ IScope scope = getChildScope(String.valueOf(roomId));
+ _log.debug("[roomLeaveByScope] {} {} {} {}", c.getUid(), roomId, rcl, scope);
+ if (rcl != null && scope != null) {
+ roomLeaveByScope(rcl, scope);
+ }
+ dropSharing(c, roomId);
+ }
+
/**
* Removes the Client from the List, stops recording, adds the Room-Leave
* event to running recordings, clear Polls and removes Client from any list
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/18b239bc/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
----------------------------------------------------------------------
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 7205139..dd9f997 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
@@ -629,6 +629,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
}
}
if (_c instanceof Client) {
+ getBean(ScopeApplicationAdapter.class).dropSharing(_c, roomId);
Client c = (Client)_c;
c.setRoom(null);
c.clear();
[2/2] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
Posted by so...@apache.org.
[OPENMEETINGS-1714] more issues are fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ad0a8251
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ad0a8251
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ad0a8251
Branch: refs/heads/master
Commit: ad0a8251b8e4983c6ad62dc9ec3b59e6feacad78
Parents: 18b239b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Oct 4 15:57:23 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Oct 4 15:57:23 2017 +0700
----------------------------------------------------------------------
.../openmeetings/web/room/wb/WbPanel.java | 6 +-
.../apache/openmeetings/web/room/wb/wb-board.js | 2 +-
.../user/dashboard/MyRoomsWidgetDescriptor.java | 30 +---------
.../web/user/dashboard/OmWidgetDescriptor.java | 60 ++++++++++++++++++++
.../dashboard/RecentRoomsWidgetDescriptor.java | 30 +---------
.../web/user/dashboard/RssWidgetDescriptor.java | 30 +---------
.../user/dashboard/StartWidgetDescriptor.java | 30 +---------
.../user/dashboard/WelcomeWidgetDescriptor.java | 30 +---------
.../dashboard/admin/AdminWidgetDescriptor.java | 30 ++--------
9 files changed, 82 insertions(+), 166 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 7698f5f..9e3787d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -565,12 +565,10 @@ public class WbPanel extends AbstractWbPanel {
if (f.exists() && f.isFile()) {
try (BufferedReader br = Files.newBufferedReader(f.toPath())) {
final boolean[] updated = {false};
- JSONArray arr = getArray(new JSONObject(new JSONTokener(br)), (o) -> {
+ JSONArray arr = getArray(new JSONObject(new JSONTokener(br)), o -> {
wb.put(o.getString("uid"), o);
updated[0] = true;
- return addFileUrl(wbs.getUid(), o, _f -> {
- updateWbSize(wb, _f);
- });
+ return addFileUrl(wbs.getUid(), o, _f -> updateWbSize(wb, _f));
});
if (updated[0]) {
WhiteboardCache.update(roomId, wb);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
index eb93b71..90efa25 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
@@ -385,6 +385,7 @@ var Wb = function() {
function wbObjCreatedHandler(o) {
if (role === NONE && o.type !== 'pointer') return;
+ let json;
switch(o.type) {
case 'pointer':
json = o;
@@ -452,7 +453,6 @@ var Wb = function() {
const h = $(this).height(), pos = $(this).position();
if (slide !== idx && pos.top > BUMPER - h && pos.top < BUMPER) {
//TODO FIXME might be done without iterating
- //console.log("Found:", idx);
_setSlide(idx);
return false;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
index cce537e..36a1cc7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
@@ -18,34 +18,10 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class MyRoomsWidgetDescriptor implements WidgetDescriptor {
+public class MyRoomsWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("781");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("782");
- }
-
- @Override
- public String getWidgetClassName() {
- return MyRoomsWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.myrooms";
+ public MyRoomsWidgetDescriptor() {
+ super("781", "782", "om.widget.myrooms");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java
new file mode 100644
index 0000000..a4110ec
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidgetDescriptor.java
@@ -0,0 +1,60 @@
+/*
+ * 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.user.dashboard;
+
+import org.apache.openmeetings.web.app.Application;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+
+public class OmWidgetDescriptor implements WidgetDescriptor {
+ private static final long serialVersionUID = 1L;
+ private final String name;
+ private final String desc;
+ private final String type;
+
+ public OmWidgetDescriptor(String name, String desc, String type) {
+ this.name = name;
+ this.desc = desc;
+ this.type = type;
+ }
+
+ @Override
+ public String getName() {
+ return Application.getString(name);
+ }
+
+ @Override
+ public String getProvider() {
+ return "Apache Openmeetings";
+ }
+
+ @Override
+ public String getDescription() {
+ return Application.getString(desc);
+ }
+
+ @Override
+ public String getWidgetClassName() {
+ return getClass().getName();
+ }
+
+ @Override
+ public String getTypeName() {
+ return type;
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java
index feb2e12..9e62cf4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidgetDescriptor.java
@@ -18,34 +18,10 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class RecentRoomsWidgetDescriptor implements WidgetDescriptor {
+public class RecentRoomsWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("widget.recent.title");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("widget.recent.desc");
- }
-
- @Override
- public String getWidgetClassName() {
- return RecentRoomsWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.recentrooms";
+ public RecentRoomsWidgetDescriptor() {
+ super("widget.recent.title", "widget.recent.desc", "om.widget.recentrooms");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
index 0cbc021..b602f01 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
@@ -18,34 +18,10 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class RssWidgetDescriptor implements WidgetDescriptor {
+public class RssWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("277");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("277");
- }
-
- @Override
- public String getWidgetClassName() {
- return RssWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.rss";
+ public RssWidgetDescriptor() {
+ super("277", "277", "om.widget.rss");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
index bf107c2..9c64a29 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
@@ -18,34 +18,10 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class StartWidgetDescriptor implements WidgetDescriptor {
+public class StartWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("widget.start.title");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("widget.start.desc");
- }
-
- @Override
- public String getWidgetClassName() {
- return StartWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.start";
+ public StartWidgetDescriptor() {
+ super("widget.start.title", "widget.start.desc", "om.widget.start");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
index 12aec81..a97fa54 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
@@ -18,34 +18,10 @@
*/
package org.apache.openmeetings.web.user.dashboard;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
-
-public class WelcomeWidgetDescriptor implements WidgetDescriptor {
+public class WelcomeWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("1546");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("1547");
- }
-
- @Override
- public String getWidgetClassName() {
- return WelcomeWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.welcome";
+ public WelcomeWidgetDescriptor() {
+ super("1546", "1547", "om.widget.welcome");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ad0a8251/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
index f57583e..e9ea7cf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
@@ -18,34 +18,12 @@
*/
package org.apache.openmeetings.web.user.dashboard.admin;
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.WidgetDescriptor;
+import org.apache.openmeetings.web.user.dashboard.OmWidgetDescriptor;
-public class AdminWidgetDescriptor implements WidgetDescriptor {
+public class AdminWidgetDescriptor extends OmWidgetDescriptor {
private static final long serialVersionUID = 1L;
- @Override
- public String getName() {
- return Application.getString("dashboard.widget.admin.title");
- }
-
- @Override
- public String getProvider() {
- return "Apache Openmeetings";
- }
-
- @Override
- public String getDescription() {
- return Application.getString("dashboard.widget.admin.desc");
- }
-
- @Override
- public String getWidgetClassName() {
- return AdminWidget.class.getName();
- }
-
- @Override
- public String getTypeName() {
- return "om.widget.admin";
+ public AdminWidgetDescriptor() {
+ super("dashboard.widget.admin.title", "dashboard.widget.admin.desc", "om.widget.admin");
}
}