Author: solomax
Date: Fri Apr 17 10:28:05 2015
New Revision: 1674266
URL: http://svn.apache.org/r1674266
Log:
[OPENMEETINGS-1199] admin->connections panel was updated to display server info
correctly; documentation improved
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/site/Clustering.html
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1674266&r1=1674265&r2=1674266&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Fri Apr 17 10:28:05 2015
@@ -45,7 +45,7 @@ import org.apache.wicket.markup.repeater
import org.apache.wicket.markup.repeater.RepeatingView;
public class ConnectionsPanel extends AdminPanel {
- private static final long serialVersionUID = -5074847509312630580L;
+ private static final long serialVersionUID = 1L;
public ConnectionsPanel(String id) {
super(id);
@@ -58,7 +58,7 @@ public class ConnectionsPanel extends Ad
@Override
public Iterator<? extends Client> iterator(long first,
long count) {
//FIXME add grouping by public SID
- List<Client> l = new
ArrayList<Client>(getBean(ISessionManager.class).getClients());
+ List<Client> l = new
ArrayList<Client>(getBean(ISessionManager.class).getClientsWithServer());
return l.subList((int)Math.max(0, first),
(int)Math.min(first + count, l.size())).iterator();
}
@@ -70,7 +70,7 @@ public class ConnectionsPanel extends Ad
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;
+ private static final long serialVersionUID = 1L;
@Override
protected void populateItem(final Item<Client> item) {
@@ -81,7 +81,7 @@ public class ConnectionsPanel extends Ad
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;
+ private static final long
serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget
target) {
@@ -92,7 +92,7 @@ public class ConnectionsPanel extends Ad
}
}.setEnabled(!TRUE.equals(c.getIsScreenClient()) &&
!TRUE.equals(c.getIsAVClient())));
item.add(new AjaxEventBehavior("onclick") {
- private static final long
serialVersionUID = 9180559138402389613L;
+ private static final long
serialVersionUID = 1L;
@Override
protected void
onEvent(AjaxRequestTarget target) {
@@ -126,7 +126,7 @@ public class ConnectionsPanel extends Ad
add(container.add(dataView).setOutputMarkupId(true),
details.setVisible(false).setOutputMarkupPlaceholderTag(true));
add(new PagedEntityListPanel("navigator", dataView) {
- private static final long serialVersionUID =
5097048616003411362L;
+ private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml?rev=1674266&r1=1674265&r2=1674266&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/Clustering.xml
Fri Apr 17 10:28:05 2015
@@ -80,7 +80,7 @@
</ul>
</section>
<section name="OM nodes configuration">
- <p>In the file
<tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt>:</p>
+ <p>In the file
<tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt>:</p>
<ul>
<li>
For each node uncomment line:
@@ -136,4 +136,4 @@ Protocol = http.
<img src="images/cluster2.png" alt="" width="650"
height="369" />
</section>
</body>
-</document>
\ No newline at end of file
+</document>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1674266&r1=1674265&r2=1674266&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
Fri Apr 17 10:28:05 2015
@@ -57,7 +57,7 @@ public class ConnectionsPanel extends Ad
@Override
public Iterator<? extends Client> iterator(long first,
long count) {
//FIXME add grouping by public SID
- List<Client> l = new
ArrayList<Client>(getBean(ISessionManager.class).getClients());
+ List<Client> l = new
ArrayList<Client>(getBean(ISessionManager.class).getClientsWithServer());
return l.subList((int)Math.max(0, first),
(int)Math.min(first + count, l.size())).iterator();
}
Modified: openmeetings/trunk/site/Clustering.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/site/Clustering.html?rev=1674266&r1=1674265&r2=1674266&view=diff
==============================================================================
--- openmeetings/trunk/site/Clustering.html (original)
+++ openmeetings/trunk/site/Clustering.html Fri Apr 17 10:28:05 2015
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2015-02-15
+ | Generated by Apache Maven Doxia at 2015-04-17
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="OpenMeetings Team" />
- <meta name="Date-Revision-yyyymmdd" content="20150215" />
+ <meta name="Date-Revision-yyyymmdd" content="20150417" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project – Clustering</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -43,7 +43,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2015-02-15
+ <li id="publishDate">Last Published: 2015-04-17
</li>
@@ -851,7 +851,7 @@
<div class="section">
<h2><a name="OM_nodes_configuration"></a>OM nodes configuration</h2>
-<p>In the file
<tt>/opt/red5/webapps/openmeetings/WEB-INF/openmeetings-applicationContext.xml</tt>:</p>
+<p>In the file
<tt>/opt/red5/webapps/openmeetings/WEB-INF/classes/openmeetings-applicationContext.xml</tt>:</p>
<ul>
