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/08/01 07:56:19 UTC
openmeetings git commit: [OPENMEETINGS-1677] basic work on clients
clean-up
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x c36434c2d -> 6d766bb62
[OPENMEETINGS-1677] basic work on clients clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6d766bb6
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6d766bb6
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6d766bb6
Branch: refs/heads/3.3.x
Commit: 6d766bb62c9c457576f524f9747346a4a6dec620
Parents: c36434c
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Aug 1 14:56:11 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Aug 1 14:56:11 2017 +0700
----------------------------------------------------------------------
.../web/admin/connection/ConnectionsPanel.html | 6 +++---
.../web/admin/connection/ConnectionsPanel.java | 5 ++++-
.../java/org/apache/openmeetings/web/app/Application.java | 10 +++++++++-
.../apache/openmeetings/test/AbstractJUnitDefaults.java | 1 -
4 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d766bb6/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
index 06d5af1..9e72b9c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
@@ -29,8 +29,8 @@
<th class="ui-widget-header one_sixth"><wicket:message key="600" /></th>
<th class="ui-widget-header one_sixth"><wicket:message key="601" /></th>
<th class="ui-widget-header one_sixth"><wicket:message key="602" /></th>
- <th class="ui-widget-header one_sixth"><wicket:message key="603" /></th>
- <th class="ui-widget-header one_sixth"><wicket:message key="1501" /></th>
+ <th class="ui-widget-header one_sixth" style="padding: 0 16px;"><wicket:message key="603" /></th>
+ <th class="ui-widget-header one_sixth"><wicket:message key="1500" /></th>
</tr>
</thead>
</table>
@@ -50,7 +50,7 @@
</div>
</div>
<div class="adminPanelColumnForm" id="adminForm">
- <table wicket:id="details" style="width: 450px; overflow-y: auto;">
+ <table wicket:id="details" style="width: 450px; overflow-y: auto; padding-bottom: 30px;">
<tr wicket:id="line"><td wicket:id="name"></td><td wicket:id="value"></td></tr>
</table>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d766bb6/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index b23baab..b8d3387 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -46,6 +46,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
+import com.googlecode.wicket.jquery.ui.form.button.ButtonBehavior;
+
public class ConnectionsPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
@@ -84,7 +86,7 @@ public class ConnectionsPanel extends AdminPanel {
@Override
protected void populateItem(final Item<IClient> item) {
IClient _c = item.getModelObject();
- ConfirmableAjaxBorder confirm = new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) {
+ final ConfirmableAjaxBorder confirm = new ConfirmableAjaxBorder("kick", getString("603"), getString("605")) {
private static final long serialVersionUID = 1L;
@Override
@@ -94,6 +96,7 @@ public class ConnectionsPanel extends AdminPanel {
target.add(container, details.setVisible(false));
}
};
+ confirm.setOutputMarkupId(true).add(new ButtonBehavior(String.format("#%s", confirm.getMarkupId())));
if (_c instanceof StreamClient) {
StreamClient c = (StreamClient)_c;
item.add(new Label("streamid"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d766bb6/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 35386aa..dcad229 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
@@ -140,6 +140,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
private final static String INVALID_SESSIONS_KEY = "INVALID_SESSIONS_KEY";
private final static String ROOMS_KEY = "ROOMS_KEY";
private final static String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY";
+ private final static String NAME_ATTR_KEY = "name";
//additional maps for faster searching should be created
private DashboardContext dashboardContext;
private static Set<String> STRINGS_WITH_APP = new HashSet<>(); //FIXME need to be removed
@@ -161,10 +162,17 @@ public class Application extends AuthenticatedWebApplication implements IApplica
getSecuritySettings().setAuthenticationStrategy(new OmAuthenticationStrategy());
getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
+ hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY, hazelcast.getName());
hazelcast.getCluster().addMembershipListener(new MembershipListener() {
@Override
- public void memberRemoved(MembershipEvent membershipEvent) {
+ public void memberRemoved(MembershipEvent evt) {
//server down, need to remove all online clients, process persistent addresses
+ for (Map.Entry<String, Client> e : getOnlineUsers().entrySet()) {
+ String serverId = evt.getMember().getStringAttribute(NAME_ATTR_KEY);
+ if (serverId.equals(e.getValue().getServerId())) {
+ exit(e.getValue());
+ }
+ }
updateJpaAddresses(_getBean(ConfigurationDao.class));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d766bb6/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
index b0c0a6c..ada7985 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
@@ -191,5 +191,4 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
assertNotNull("Cann't add user", user);
return user;
}
-
}