OF-651 - Monitoring plugin should have an option to purge and restrict

Restriction implemented, purging left

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13650 b35dd754-fafc-0310-a699-88a17e54d16e

src/plugins/monitoring/src/i18n/monitoring_i18n.properties

@@ -76,6 +76,10 @@ archive.settings.idle.time = Idle Time
 archive.settings.idle.time.description = The number of minutes a conversation can be idle before it's ended.
 archive.settings.max.time = Max Time
 archive.settings.max.time.description = The maximum number of minutes a conversation can last before it's ended.
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.index.settings = Index Settings
 archive.settings.index.settings.description = View and/or rebuild the current Search Index.
 archive.settings.current.index = Current Search Index

src/plugins/monitoring/src/i18n/monitoring_i18n_cs_CZ.properties

@@ -50,6 +50,10 @@ archive.settings.idle.time = Doba ne\u010dinnosti
 archive.settings.idle.time.description = Po\u010det minut b\u011bhem kter\u00fdch m\u016f\u017ee b\u00fdt konverzace ne\u010dinn\u00e1 ne\u017e bude ukon\u010dena.
 archive.settings.max.time = Maxim\u00e1ln\u00ed \u010das
 archive.settings.max.time.description = Maxim\u00e1ln\u00ed po\u010det minut trv\u00e1n\u00ed konverzace ne\u017e bude ukon\u010dena.
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.index.settings = Nastaven\u00ed index\u016f
 archive.settings.index.settings.description = Prohl\u00ed\u017een\u00ed a/nebo obnova aktu\u00e1ln\u00edho vyhled\u00e1vac\u00edho indexu.
 archive.settings.current.index = Aktu\u00e1ln\u00ed vyhled\u00e1vac\u00ed index

src/plugins/monitoring/src/i18n/monitoring_i18n_es.properties

@@ -50,6 +50,10 @@ archive.settings.idle.time = Tiempo Ocioso
 archive.settings.idle.time.description = El n\u00famero de minutos una conversaci\u00f3n puede estar libre antes de ser finalizada.
 archive.settings.max.time = Tiempo M\u00e1ximo
 archive.settings.max.time.description = El m\u00e1ximo n\u00famero de minutos una conversacion puede durar antes de ser finalizada.
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Max Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.index.settings = Seteos de Indices
 archive.settings.index.settings.description = Ver y/o reconstruir el \u00edndice de b\u00fasqueda actual.
 archive.settings.current.index = Indice de B\u00fasqueda Actual

src/plugins/monitoring/src/i18n/monitoring_i18n_fr.properties

@@ -110,6 +110,10 @@ archive.settings.index.settings=Param\u00e8tres d'Indexage
 archive.settings.index.settings.description=Voir et/ou reconstruire les indexes de recherche.
 archive.settings.max.time=Temps Max
 archive.settings.max.time.description=Le nombre de minutes maximum d'une conversation avant qu'elle ne soit coup\u00e9e automatiquement.
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.message.count=Nombre de messages archiv\u00e9s
 archive.settings.message.count.description=Le nombre total de messages archiv\u00e9s.
 archive.settings.message.metadata.description=Activer ou D\u00e9sactiver l'archivage des messages et/ou metadata.

src/plugins/monitoring/src/i18n/monitoring_i18n_pt_BR.properties

@@ -74,6 +74,10 @@ archive.settings.idle.time = Tempo Ocioso
 archive.settings.idle.time.description = N\u00famero de minutos que a conversa pode estar ociosa antes de ser encerrada.
 archive.settings.max.time = Tempo M\u00e1ximo
 archive.settings.max.time.description = N\u00famero m\u00e1ximo de minutos que a conversa pode durar antes de ser encerrada.
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.index.settings = Ajustes de \u00edndice
 archive.settings.index.settings.description = Ver e/ou refazer o \u00edndice de Buscas atual.
 archive.settings.current.index = \u00edndice de Buscas Atual

src/plugins/monitoring/src/i18n/monitoring_i18n_zh_CN.properties

@@ -71,6 +71,10 @@ archive.settings.idle.time = \u7a7a\u95f2\u65f6\u95f4
 archive.settings.idle.time.description = \u4f1a\u8bdd\u7ed3\u675f\u540e\u7a7a\u95f2\u7684\u65f6\u95f4
 archive.settings.max.time = \u6700\u5927\u65f6\u95f4
 archive.settings.max.time.description = \u4f1a\u8bdd\u7ed3\u675f\u524d\u53ef\u6301\u7eed\u7684\u6700\u5927\u65f6\u95f4
+archive.settings.max.age = Max Message Age
+archive.settings.max.age.description = The maximum number of days to keep messages before purging them from the database.
+archive.settings.max.retrievable = Retrievable Messages
+archive.settings.max.retrievable.description = The number of days worth of messages a user is allowed to retrieve.
 archive.settings.index.settings = \u7d22\u5f15\u8bbe\u7f6e
 archive.settings.index.settings.description = \u67e5\u770b\u6216\u91cd\u5efa\u5f53\u524d\u7684\u641c\u7d22\u7d22\u5f15
 archive.settings.current.index = \u5f53\u524d\u7684\u641c\u7d22\u7d22\u5f15

src/plugins/monitoring/src/web/archiving-settings.jsp

@@ -163,6 +163,10 @@
     boolean roomArchiving = conversationManager.isRoomArchivingEnabled();
     int idleTime = ParamUtils.getIntParameter(request, "idleTime", conversationManager.getIdleTime());
     int maxTime = ParamUtils.getIntParameter(request, "maxTime", conversationManager.getMaxTime());
+    
+    int maxAge = ParamUtils.getIntParameter(request, "maxAge", conversationManager.getMaxAge());
+    int maxRetrievable = ParamUtils.getIntParameter(request, "maxRetrievable", conversationManager.getMaxRetrievable());
+    
     boolean rebuildIndex = request.getParameter("rebuild") != null;
 
     if (request.getParameter("cancel") != null) {
@@ -197,6 +201,14 @@
             errors.put("roomsArchived", "");
             errorMessage = "Only name of local rooms should be specified.";
         }
+        if (maxAge < 0) {
+            errors.put("maxAge", "");
+            errorMessage = "Max Age must be greater than or equal to 0.";
+        }
+        if (maxRetrievable < 1) {
+            errors.put("maxRetrievable", "");
+            errorMessage = "Max Retrievable must be greater than or equal to 0.";
+        }
         // If no errors, continue:
         if (errors.size() == 0) {
             conversationManager.setMetadataArchivingEnabled(metadataArchiving);
@@ -205,6 +217,9 @@
             conversationManager.setRoomsArchived(StringUtils.stringToCollection(roomsArchived));
             conversationManager.setIdleTime(idleTime);
             conversationManager.setMaxTime(maxTime);
+            
+            conversationManager.setMaxAge(maxAge);
+            conversationManager.setMaxRetrievable(maxRetrievable);
 
 %>
 <div class="success">
@@ -285,6 +300,21 @@
                 <td><input type="text" name="maxTime" size="10" maxlength="10" value="<%= conversationManager.getMaxTime()%>" /></td>
                 <td></td>
             </tr>
+            
+            <tr>
+                <td><label class="jive-label"><fmt:message key="archive.settings.max.age"/>:</label><br>
+                <fmt:message key="archive.settings.max.age.description"/><br><br></td>
+                <td><input type="text" name="maxAge" size="10" maxlength="10" value="<%= conversationManager.getMaxAge()%>" /></td>
+                <td></td>
+            </tr>
+            
+            <tr>
+                <td><label class="jive-label"><fmt:message key="archive.settings.max.retrievable"/>:</label><br>
+                <fmt:message key="archive.settings.max.retrievable.description"/><br><br></td>
+                <td><input type="text" name="maxRetrievable" size="10" maxlength="10" value="<%= conversationManager.getMaxRetrievable()%>" /></td>
+                <td></td>
+            </tr>
+            
         </tbody>
     </table>