Author: sebawagner
Date: Thu Nov 1 14:38:42 2012
New Revision: 1404614
URL: http://svn.apache.org/viewvc?rev=1404614&view=rev
Log:
OPENMEETINGS-460:
Update server admin panel with new fields,
add new field "lastPing"
set insertedBy and updatedBy fields to be loaded LAZY
Exception in current Axis2 implementation, so that admin section fails
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
Thu Nov 1 14:38:42 2012
@@ -38,6 +38,7 @@
</dataset>
<method name="call">
+ if ($debug) Debug.write("this.restdataset
",this.restdataset);
this.restdataset.doRequest();
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
Thu Nov 1 14:38:42 2012
@@ -22,7 +22,8 @@
<!--- Existing user list. used by userAdmin only -->
<class name="serverAdminListItem" extends="baseContentListItem">
<turnOverTextItem text="$once{ parent.obj.id }" width="60" />
- <turnOverTextItem text="$once{ parent.obj.name }" width="232" />
+ <turnOverTextItem text="$once{ parent.obj.name }" width="132" />
<turnOverTextItem text="$once{ parent.obj.address }"
width="132" />
+ <turnOverTextItem text="$once{ parent.obj.lastPing }"
width="100" />
</class>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
Thu Nov 1 14:38:42 2012
@@ -37,6 +37,8 @@
this.server_id = 0;
this.serverName.setAttribute('text', '');
this.ip.setAttribute('text', '');
+ this.lastPing.setAttribute('text','');
+ this.comment.setAttribute('text','');
</handler>
<handler name="ondelete" >
@@ -57,13 +59,14 @@
this.server_id = server.id;
this.serverName.setAttribute('text', server.name);
this.ip.setAttribute('text', server.address);
+ this.lastPing.setAttribute('text', server.lastPing);
+ this.comment.setAttribute('text', server.comment);
</method>
-
<method name="doSaveEvent">
<![CDATA[
var dh = new lz.datasetHelper(this);
- dh.setServiceSource('ServerService/saveServer', {id:
this.server_id, name: this.serverName.getText(), address: this.ip.getText()});
+ dh.setServiceSource('ServerService/saveServer', {id:
this.server_id, name: this.serverName.getText(), address: this.ip.getText(),
comment: this.comment.getText() });
dh.successHandler = getSavedId;
dh.call();
]]>
@@ -83,8 +86,22 @@
<labelText labelid="1500" width="200" y="70" resize="false" x="2"/>
<customEdittext name="serverName" y="70" x="120" width="270" />
-
- <labelText labelid="1501" width="200" y="100" resize="false" x="2"/>
+
+ <labelText labelid="1501" width="200" y="100" resize="false" x="2"/>
<customEdittext name="ip" y="100" x="120" width="270" />
+
+ <view resource="messagebox_info_rsc" x="2" y="130" />
+
+ <labelText labelid="1516" x="24" y="130" fontstyle="italic"
+ multiline="true" width="370" />
+
+ <labelText labelid="1515" width="200" y="190" resize="false" x="2"/>
+ <labelText name="lastPing" y="190" x="120" width="270" />
+
+ <labelText labelid="270" width="200" y="220" resize="false" x="2"/>
+ <customScrollEdittext name="comment" y="220" x="120"
width="270"
+ height="100" text="" />
+
</class>
+
</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
Thu Nov 1 14:38:42 2012
@@ -48,8 +48,9 @@
<handler name="oninit">
this.addHeaderItem(188, 60);
- this.addHeaderItem(1500, 232);
+ this.addHeaderItem(1500, 132);
this.addHeaderItem(1501, 132);
+ this.addHeaderItem(1515, 100);
loadServersData(this);
</handler>
@@ -73,6 +74,8 @@
var s = {id: dp.xpathQuery(basePath + 'id/text()')
, name: dp.xpathQuery(basePath + 'name/text()')
, address: dp.xpathQuery(basePath +
'address/text()')
+ , lastPing: dp.xpathQuery(basePath +
'lastPing/text()')
+ , comment: dp.xpathQuery(basePath +
'comment/text()')
};
var li = new
lz.serverAdminListItem(this._innerlist._inn._inn, {obj: s});
if (parent._serverAdminValueForm.server_id == 0) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebService.java
Thu Nov 1 14:38:42 2012
@@ -95,15 +95,16 @@ public class ServerWebService {
* @param id - the id of the server to save
* @param name - the name of the server to save
* @param address - the address(DNS name or IP) of the server to save
+ * @param comment - comment for the server
* @return the id of saved server
*/
- public long saveServer(String SID, long id, String name, String
address) {
+ public long saveServer(String SID, long id, String name, String
address, String comment) {
log.debug("saveServerCount enter");
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkWebServiceLevel(user_level)) {
- return serversDao.saveServer(id, name, address).getId();
+ return serversDao.saveServer(id, name, address,
comment, users_id).getId();
} else {
log.warn("Insuffisient permissions");
return -1;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
Thu Nov 1 14:38:42 2012
@@ -66,10 +66,10 @@ public class ServerWebServiceFacade {
}
/**
- * Proxy method please see {@link ServerWebService#saveServer(String,
long, String, String)}
+ * Proxy method please see {@link ServerWebService#saveServer(String,
long, String, String, String)}
*/
- public long saveServer(String SID, long id, String name, String
address) {
- return getServerServiceProxy().saveServer(SID, id, name,
address);
+ public long saveServer(String SID, long id, String name, String
address, String comment) {
+ return getServerServiceProxy().saveServer(SID, id, name,
address, comment);
}
/**
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ServerDao.java
Thu Nov 1 14:38:42 2012
@@ -174,13 +174,19 @@ public class ServerDao implements IDataP
* @return
*/
@Deprecated
- public Server saveServer(long id, String name, String address) {
+ public Server saveServer(long id, String name, String address, String
comment, long userId) {
Server s = get(id);
if (s == null) {
s = new Server();
+ s.setInserted(new Date());
+ s.setInsertedby(usersDao.get(userId));
+ } else {
+ s.setUpdated(new Date());
+ s.setUpdatedby(usersDao.get(userId));
}
s.setName(name);
s.setAddress(address);
+ s.setComment(comment);
return em.merge(s);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1404614&r1=1404613&r2=1404614&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
Thu Nov 1 14:38:42 2012
@@ -43,7 +43,7 @@ import org.simpleframework.xml.Root;
@NamedQueries({
@NamedQuery(name = "getAllServers", query = "SELECT s FROM
Server s WHERE s.deleted = false"),
@NamedQuery(name = "getServerCount", query = "SELECT COUNT(s)
FROM Server s WHERE s.deleted = false"),
- @NamedQuery(name = "getServerById", query = "SELECT s FROM
Server s WHERE s.deleted = false AND s.id = :id"),
+ @NamedQuery(name = "getServerById", query = "SELECT s FROM
Server s LEFT JOIN FETCH s.insertedby LEFT JOIN FETCH s.updatedby WHERE
s.deleted = false AND s.id = :id"),
@NamedQuery(name = "getServerByAddress", query = "SELECT s FROM
Server s WHERE s.deleted = false AND s.address = :address"),
@NamedQuery(name = "getServersWithNoUsers", query = "SELECT s
FROM Server s WHERE s.deleted = false AND s.id NOT IN (SELECT u.server.id FROM
Users u where u.server.id IS NOT NULL)"),
@NamedQuery(name = "getServerWithMinimumUsers", query = "SELECT
s.id, COUNT(u) AS cnt FROM Users u JOIN u.server s WHERE s.deleted = false
GROUP BY s.id ORDER BY cnt") })
@@ -73,11 +73,11 @@ public class Server implements Serializa
@Column(name = "updated")
public Date updated;
- @ManyToOne(fetch = FetchType.EAGER)
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "insertedby_id", updatable = true, insertable = true)
public Users insertedby;
- @ManyToOne(fetch = FetchType.EAGER)
+ @ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "updatedby_id", updatable = true, insertable = true)
public Users updatedby;
@@ -86,6 +86,10 @@ public class Server implements Serializa
@Element(data = true, required = false)
private String comment;
+ @Column(name = "last_ping", nullable = true)
+ @Element(data = true, required = false)
+ private Date lastPing;
+
@Column(name = "deleted", nullable = false)
@Element(data = true)
private boolean deleted = false;
@@ -161,6 +165,14 @@ public class Server implements Serializa
public void setComment(String comment) {
this.comment = comment;
}
+
+ public Date getLastPing() {
+ return lastPing;
+ }
+
+ public void setLastPing(Date lastPing) {
+ this.lastPing = lastPing;
+ }
@Override
public String toString() {
