You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/11/02 16:11:14 UTC
svn commit: r1404997 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ docs/ src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/data/basic/dao/
src/org/apache/openmeetings/persistence/beans/basic/
Author: sebawagner
Date: Fri Nov 2 15:11:12 2012
New Revision: 1404997
URL: http://svn.apache.org/viewvc?rev=1404997&view=rev
Log:
OPENMEETINGS-460 Add and implement ping method in ServerService
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/errorvalues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html
incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html
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/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Fri Nov 2 15:11:12 2012
@@ -4591,4 +4591,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Fri Nov 2 15:11:12 2012
@@ -4589,4 +4589,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Fri Nov 2 15:11:12 2012
@@ -4602,4 +4602,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Fri Nov 2 15:11:12 2012
@@ -4589,4 +4589,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Nov 2 15:11:12 2012
@@ -6057,4 +6057,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Fri Nov 2 15:11:12 2012
@@ -4586,4 +4586,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Fri Nov 2 15:11:12 2012
@@ -6033,4 +6033,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/errorvalues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/errorvalues.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/errorvalues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/errorvalues.xml Fri Nov 2 15:11:12 2012
@@ -452,4 +452,20 @@
<field name="fieldvalues_id">1431</field>
<field name="errortype_id">1</field>
</row>
+ <row>
+ <field name="errorvalues_id">55</field>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="fieldvalues_id">1519</field>
+ <field name="errortype_id">1</field>
+ </row>
+ <row>
+ <field name="errorvalues_id">56</field>
+ <field name="starttime" />
+ <field name="updatetime" />
+ <field name="deleted">false</field>
+ <field name="fieldvalues_id">1520</field>
+ <field name="errortype_id">1</field>
+ </row>
</ROOT>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Fri Nov 2 15:11:12 2012
@@ -4589,4 +4589,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Fri Nov 2 15:11:12 2012
@@ -4589,4 +4589,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Fri Nov 2 15:11:12 2012
@@ -4663,4 +4663,10 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Fri Nov 2 15:11:12 2012
@@ -4591,4 +4591,10 @@ Details
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Fri Nov 2 15:11:12 2012
@@ -4598,4 +4598,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Fri Nov 2 15:11:12 2012
@@ -4589,4 +4589,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Fri Nov 2 15:11:12 2012
@@ -4590,4 +4590,10 @@ see http://incubator.apache.org/openmeet
<string id="1518" name="server admin section lastping info">
<value>Every slave sends a ping to the master every 3 seconds (configurable). Slave lastPing must be smaller then 1 minute so that the master uses the slave.</value>
</string>
+ <string id="1519" name="server admin ping failed">
+ <value>Ping failed, could not find server by this name.</value>
+ </string>
+ <string id="1520" name="server admin ping failed">
+ <value>Ping failed, multiple servers found with this name.</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html Fri Nov 2 15:11:12 2012
@@ -1237,6 +1237,28 @@ limitations under the License.
You don't have the right to give yourself or others exclusive audio. You need to apply for the right from the moderator or ask the moderator to give you exclusive audio.
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ -55
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ Error
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ Ping failed, could not find server by this name.
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ -56
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ Error
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left" style="color: black; font-size: small; font-family: arial, helvetica, sanserif;">
+ Ping failed, multiple servers found with this name.
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified: incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html?rev=1404997&r1=1404996&r2=1404997&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html Fri Nov 2 15:11:12 2012
@@ -62,6 +62,17 @@ limitations under the License.
<a href="#deleteServer"><b>deleteServer</b></a><br/>
<div class="navigation_comment"><i >Method to delete server</i></div>
</div>
+ <div>
+ <a href="#ping"><b>ping</b></a><br/>
+ <div class="navigation_comment"><i >Receive a ping from the slave, see <a
+ href="http://incubator.apache.org/openmeetings/ClusteringManual.html"
+ target
+ ="_BLANK">http://incubator.apache.org/openmeetings/ClusteringManual.
+ html</a>
+
+ You can specify either the name. The name has to match a server in the
+ table of servers</i></div>
+ </div>
</div>
<h3>Methods Details in ServerService</h3>
@@ -304,6 +315,66 @@ limitations under the License.
REST Sample Call/URL:<br/>
<a href="http://localhost:5080/openmeetings/services/ServerService/deleteServer?SID=VALUE&id=VALUE">http://localhost:5080/openmeetings/services/ServerService/deleteServer?&</a>
</div>
+ <div class="method">
+ <div class="method_header">
+ <div style="margin-left:10px">
+ <a name="ping" ><b>ping</b></a>
+ </div>
+ </div>
+
+ Method: <i>ping (
+ String SID
+ ,
+ String name
+ )
+ </i><br/>
+ <p>
+ Receive a ping from the slave, see <a
+ href="http://incubator.apache.org/openmeetings/ClusteringManual.html"
+ target
+ ="_BLANK">http://incubator.apache.org/openmeetings/ClusteringManual.
+ html</a>
+
+ You can specify either the name. The name has to match a server in the
+ table of servers
+ </p>
+ <p>
+ Return Type: long
+ </p>
+ <p>Params:</p>
+
+ <table rules="all" border="1">
+ <thead>
+ <tr>
+ <th width="200" align="left">Type</th>
+ <th width="200" align="left">Fieldname</th>
+ <th width="400" align="left">Description</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">SID</td>
+ <td valign="top">- session id to identify the user making request, WebService
+ Level required</td>
+ </tr>
+
+ <tr>
+ <td valign="top">
+ String
+ </td>
+ <td valign="top">name</td>
+ <td valign="top">- the name of the server to be updated</td>
+ </tr>
+
+ </tbody>
+ </table>
+ <br/>
+ REST Sample Call/URL:<br/>
+ <a href="http://localhost:5080/openmeetings/services/ServerService/ping?SID=VALUE&name=VALUE">http://localhost:5080/openmeetings/services/ServerService/ping?&</a>
+ </div>
</body>
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=1404997&r1=1404996&r2=1404997&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 Fri Nov 2 15:11:12 2012
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.axis.services;
+import org.apache.axis2.AxisFault;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
@@ -56,7 +57,7 @@ public class ServerWebService {
* @param max - Maximum server count
* @return The list of servers participating in cluster
*/
- public Server[] getServers(String SID, int start, int max) {
+ public Server[] getServers(String SID, int start, int max) throws AxisFault {
log.debug("getServers enter");
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -75,7 +76,7 @@ public class ServerWebService {
* @param SID - session id to identify the user making request
* @return total count of the servers participating in cluster
*/
- public int getServerCount(String SID) {
+ public int getServerCount(String SID) throws AxisFault {
log.debug("getServerCount enter");
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -98,7 +99,8 @@ public class ServerWebService {
* @param comment - comment for the server
* @return the id of saved server
*/
- public long saveServer(String SID, long id, String name, String address, String comment) {
+ public long saveServer(String SID, long id, String name, String address,
+ String comment) throws AxisFault {
log.debug("saveServerCount enter");
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -118,7 +120,7 @@ public class ServerWebService {
* @param id - the id of the server to delete
* @return true if the server was deleted, false otherwise
*/
- public boolean deleteServer(String SID, long id) {
+ public boolean deleteServer(String SID, long id) throws AxisFault {
log.debug("saveServerCount enter");
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -130,4 +132,35 @@ public class ServerWebService {
return false;
}
}
+
+ /**
+ * Receive a ping from the slave, see <a
+ * href="http://incubator.apache.org/openmeetings/ClusteringManual.html"
+ * target
+ * ="_BLANK">http://incubator.apache.org/openmeetings/ClusteringManual.
+ * html</a>
+ *
+ * You can specify either the name. The name has to match a server in the
+ * table of servers
+ *
+ * @param SID
+ * - session id to identify the user making request, WebService
+ * Level required
+ * @param name
+ * - the name of the server to be updated
+ * @return positive value in case of success, otherwise an error id
+ * @throws AxisFault
+ */
+ public long ping(String SID, String name) throws AxisFault {
+ Long users_id = sessionManagement.checkSession(SID);
+ Long user_level = userManagement.getUserLevelByID(users_id);
+
+ if (authLevelManagement.checkWebServiceLevel(user_level)) {
+ return serversDao.updateLastPing(name, users_id);
+ } 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=1404997&r1=1404996&r2=1404997&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 Fri Nov 2 15:11:12 2012
@@ -20,6 +20,7 @@ package org.apache.openmeetings.axis.ser
import javax.servlet.ServletContext;
+import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.openmeetings.OpenmeetingsVariables;
@@ -54,28 +55,29 @@ public class ServerWebServiceFacade {
/**
* Proxy method please see {@link ServerWebService#getServers(String, int, int)}
*/
- public Server[] getServers(String SID, int start, int max) {
+ public Server[] getServers(String SID, int start, int max) throws AxisFault {
return getServerServiceProxy().getServers(SID, start, max);
}
/**
* Proxy method please see {@link ServerWebService#getServerCount(String)}
*/
- public int getServerCount(String SID) {
+ public int getServerCount(String SID) throws AxisFault {
return getServerServiceProxy().getServerCount(SID);
}
/**
* Proxy method please see {@link ServerWebService#saveServer(String, long, String, String, String)}
*/
- public long saveServer(String SID, long id, String name, String address, String comment) {
+ public long saveServer(String SID, long id, String name, String address,
+ String comment) throws AxisFault {
return getServerServiceProxy().saveServer(SID, id, name, address, comment);
}
/**
* Proxy method please see {@link ServerWebService#deleteServer(String, long)}
*/
- public boolean deleteServer(String SID, long id) {
+ public boolean deleteServer(String SID, long id) throws AxisFault {
return getServerServiceProxy().deleteServer(SID, id);
}
}
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=1404997&r1=1404996&r2=1404997&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 Fri Nov 2 15:11:12 2012
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.data.basic.dao;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -250,4 +251,35 @@ public class ServerDao implements IDataP
em.merge(entity);
}
}
+
+ /**
+ * Update the last ping of any server.
+ *
+ * @param name
+ * @param userId
+ * @return
+ */
+ public long updateLastPing(String name, long userId) {
+
+ TypedQuery<Server> q = em.createNamedQuery("getServerByName",
+ Server.class);
+ q.setParameter("name", name);
+ List<Server> l = q.getResultList();
+ if (l.size() == 0) {
+ log.debug("No server found with name: " + name);
+ return -55L;
+ } else if (l.size() == 1) {
+ Server server = l.get(0);
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(new Date());
+ server.setLastPing(cal);
+ update(server, userId);
+ } else {
+ log.debug("Multiple server found with name: " + name);
+ return -56L;
+ }
+
+ return -1L;
+ }
+
}
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=1404997&r1=1404996&r2=1404997&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 Fri Nov 2 15:11:12 2012
@@ -19,6 +19,7 @@
package org.apache.openmeetings.persistence.beans.basic;
import java.io.Serializable;
+import java.util.Calendar;
import java.util.Date;
import javax.persistence.Column;
@@ -44,7 +45,8 @@ import org.simpleframework.xml.Root;
@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 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 = "getServerByName", query = "SELECT s FROM Server s WHERE s.deleted = false AND s.address LIKE :name"),
+ @NamedQuery(name = "getServerByAddress", query = "SELECT s FROM Server s WHERE s.deleted = false AND s.address LIKE :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") })
@Table(name = "server")
@@ -88,7 +90,7 @@ public class Server implements Serializa
@Column(name = "last_ping", nullable = true)
@Element(data = true, required = false)
- private Date lastPing;
+ private Calendar lastPing;
@Column(name = "deleted", nullable = false)
@Element(data = true)
@@ -166,11 +168,11 @@ public class Server implements Serializa
this.comment = comment;
}
- public Date getLastPing() {
+ public Calendar getLastPing() {
return lastPing;
}
- public void setLastPing(Date lastPing) {
+ public void setLastPing(Calendar lastPing) {
this.lastPing = lastPing;
}