Author: solomax
Date: Mon May 20 18:29:13 2013
New Revision: 1484557
URL: http://svn.apache.org/r1484557
Log:
[OPENMEETINGS-637] Admin connections panel is added
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java?rev=1484557&r1=1484556&r2=1484557&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
Mon May 20 18:29:13 2013
@@ -33,6 +33,7 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.utils.math.CalendarPatterns;
@@ -61,7 +62,7 @@ import org.apache.openmeetings.utils.mat
@NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.room_id
FROM Client c WHERE c.server = :server GROUP BY c.room_id")
})
@Table(name = "client")
-public class Client implements Serializable {
+public class Client implements IDataProviderEntity, Serializable {
/**
*
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1484557&r1=1484556&r2=1484557&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Mon May 20 18:29:13 2013
@@ -24,8 +24,8 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
-import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -40,7 +40,6 @@ import org.apache.wicket.markup.repeater
*
*/
public class ConfigsPanel extends AdminPanel {
-
private static final long serialVersionUID = -1L;
private ConfigForm form;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1484557&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
Mon May 20 18:29:13 2013
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org";>
+<wicket:panel>
+ <div class="adminPanel">
+ <div class="adminPanelColumnTable">
+ <span wicket:id="navigator">[dataview navigator]</span>
+ <table class="adminListTable">
+ <thead>
+ <tr>
+ <th><wicket:ommessage key="599"
/></th>
+ <th><wicket:ommessage key="600"
/></th>
+ <th><wicket:ommessage key="601"
/></th>
+ <th><wicket:ommessage key="602"
/></th>
+ <th><wicket:ommessage key="603"
/></th>
+ <th><wicket:ommessage
key="1501" /></th>
+ </tr>
+ </thead>
+ <tbody wicket:id="container" >
+ <tr wicket:id="clientList">
+ <td wicket:id="id"></td>
+ <td wicket:id="login"></td>
+ <td wicket:id="since"></td>
+ <td wicket:id="scope"></td>
+ <td><a
wicket:id="kick"><wicket:ommessage key="603" /></a></td>
+ <td wicket:id="server"></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div class="adminPanelColumnForm">
+ <table wicket:id="details" style="width: 100%;">
+ <tr wicket:id="line"><td
wicket:id="name"></td><td wicket:id="value"></td></tr>
+ </table>
+ </div>
+ </div>
+</wicket:panel>
+</html>
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1484557&view=auto
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(added)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Mon May 20 18:29:13 2013
@@ -0,0 +1,141 @@
+/*
+ * 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.admin.connection;
+
+import static java.lang.Boolean.TRUE;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getSid;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.remote.UserService;
+import org.apache.openmeetings.session.SessionManager;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
+import org.apache.openmeetings.web.common.ConfirmableAjaxLink;
+import org.apache.openmeetings.web.data.SearchableDataProvider;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RepeatingView;
+
+public class ConnectionsPanel extends AdminPanel {
+ private static final long serialVersionUID = -5074847509312630580L;
+
+ public ConnectionsPanel(String id) {
+ super(id);
+
+ SearchableDataProvider<Client> sdp = new
SearchableDataProvider<Client>(null) {
+ private static final long serialVersionUID = 1L;
+
+ //FIXME add search
+
+ @Override
+ public Iterator<? extends Client> iterator(long first,
long count) {
+ //FIXME add grouping by public SID
+ List<Client> l = new
ArrayList<Client>(getBean(SessionManager.class).getClients());
+ return l.subList((int)Math.max(0, first),
(int)Math.min(first + count, l.size())).iterator();
+ }
+
+ @Override
+ public long size() {
+ return
getBean(SessionManager.class).getClients().size();
+ }
+ };
+ final WebMarkupContainer container = new
WebMarkupContainer("container");
+ final WebMarkupContainer details = new
WebMarkupContainer("details");
+ SearchableDataView<Client> dataView = new
SearchableDataView<Client>("clientList", sdp) {
+ private static final long serialVersionUID =
2863400959190625386L;
+
+ @Override
+ protected void populateItem(final Item<Client> item) {
+ Client c = item.getModelObject();
+ item.add(new Label("id", c.getStreamid()));
+ item.add(new Label("login", c.getUsername()));
+ item.add(new Label("since",
c.getConnectedSince()));
+ item.add(new Label("scope", c.getScope()));
+ item.add(new Label("server", c.getServer() ==
null ? "no cluster" : c.getServer().getAddress())); //FIXME localization
+ item.add(new ConfirmableAjaxLink("kick", 605) {
+ private static final long
serialVersionUID = 1860369399943234763L;
+
+ @Override
+ public void onClick(AjaxRequestTarget
target) {
+ Client c =
item.getModelObject();
+
getBean(UserService.class).kickUserByStreamId(getSid(), c.getStreamid()
+ , c.getServer()
== null ? 0 : c.getServer().getId());
+ target.add(container,
details.setVisible(false));
+ }
+
}.setEnabled(!TRUE.equals(c.getIsScreenClient()) &&
!TRUE.equals(c.getIsAVClient())));
+ item.add(new AjaxEventBehavior("onclick") {
+ private static final long
serialVersionUID = 9180559138402389613L;
+
+ @Override
+ protected void
onEvent(AjaxRequestTarget target) {
+ Field[] ff =
Client.class.getDeclaredFields();
+ RepeatingView lines = new
RepeatingView("line");
+ Client c =
item.getModelObject();
+ for (Field f : ff) {
+ int mod =
f.getModifiers();
+ if
(Modifier.isStatic(mod) || Modifier.isTransient(mod)) {
+ continue;
+ }
+ WebMarkupContainer line
= new WebMarkupContainer(lines.newChildId());
+ line.add(new
Label("name", f.getName()));
+ String val = "";
+ try {
+
f.setAccessible(true);
+ val = "" +
f.get(c);
+ } catch (Exception e) {
+ //noop
+ }
+ line.add(new
Label("value", val));
+ lines.add(line);
+ }
+ details.addOrReplace(lines);
+
target.add(details.setVisible(true));
+ }
+ });
+ item.add(AttributeModifier.append("class",
"clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ }
+ };
+ add(container.add(dataView).setOutputMarkupId(true),
details.setVisible(false).setOutputMarkupPlaceholderTag(true));
+
+ add(new PagedEntityListPanel("navigator", dataView) {
+ private static final long serialVersionUID =
5097048616003411362L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ target.add(container);
+ }
+ });
+ }
+
+ @Override
+ public void onMenuPanelLoad(AjaxRequestTarget target) {
+ }
+}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1484557&r1=1484556&r2=1484557&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/OmUrlFragment.java
Mon May 20 18:29:13 2013
@@ -26,6 +26,7 @@ import java.io.Serializable;
import org.apache.openmeetings.web.admin.backup.BackupPanel;
import org.apache.openmeetings.web.admin.configurations.ConfigsPanel;
+import org.apache.openmeetings.web.admin.connection.ConnectionsPanel;
import org.apache.openmeetings.web.admin.groups.GroupsPanel;
import org.apache.openmeetings.web.admin.labels.LangPanel;
import org.apache.openmeetings.web.admin.ldaps.LdapsPanel;
@@ -203,6 +204,7 @@ public class OmUrlFragment implements Se
if (TYPE_USER.equals(type)) {
basePanel = new UsersPanel(CHILD_ID);
} else if (TYPE_CONNECTION.equals(type)) {
+ basePanel = new
ConnectionsPanel(CHILD_ID);
} else if (TYPE_GROUP.equals(type)) {
basePanel = new GroupsPanel(CHILD_ID);
} else if (TYPE_ROOM.equals(type)) {
