You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/02 10:24:44 UTC
svn commit: r1737471 [1/2] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/
branches/3.1.x/openmeetings-...
Author: solomax
Date: Sat Apr 2 08:24:43 2016
New Revision: 1737471
URL: http://svn.apache.org/viewvc?rev=1737471&view=rev
Log:
[OPENMEETINGS-649] email reset is added, minor issues are fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Sat Apr 2 08:24:43 2016
@@ -243,8 +243,9 @@ public class MailHandler {
log.error("Error while sending message", e);
m.setErrorCount(m.getErrorCount() + 1);
StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- pw.close();
+ try (PrintWriter pw = new PrintWriter(sw)) {
+ e.printStackTrace(pw);
+ }
m.setLastError(sw.getBuffer().toString());
m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java Sat Apr 2 08:24:43 2016
@@ -23,10 +23,12 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
+import org.apache.wicket.util.string.Strings;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -50,9 +52,26 @@ public class MailMessageDao implements
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ private <T> TypedQuery<T> getQuery(boolean isCount, String search, String order, Class<T> clazz) {
+ StringBuilder sb = new StringBuilder("SELECT ");
+ sb.append(isCount ? "COUNT(m)" : "m")
+ .append(" FROM MailMessage m");
+ if (!Strings.isEmpty(search)) {
+ sb.append(" WHERE m.recipients LIKE :search OR m.subject LIKE :search OR m.body LIKE :search OR m.lastError LIKE :search");
+ }
+ if (!Strings.isEmpty(order)) {
+ sb.append(" ORDER BY m.").append(order);
+ }
+ TypedQuery<T> q = em.createQuery(sb.toString(), clazz);
+ if (!Strings.isEmpty(search)) {
+ q.setParameter("search", String.format("%%%s%%", search));
+ }
+ return q;
+ }
+
@Override
public List<MailMessage> get(String search, int start, int count, String order) {
- return get(start, count);
+ return getQuery(false, search, order, MailMessage.class).setFirstResult(start).setMaxResults(count).getResultList();
}
@Override
@@ -62,18 +81,24 @@ public class MailMessageDao implements
@Override
public long count(String search) {
- return count();
+ return getQuery(true, search, null, Long.class).getSingleResult();
}
public void resetSendingStatus(Calendar date) {
- em.createQuery("UPDATE MailMessage m SET m.status = :noneStatus WHERE m.status = :sendingStatus " +
- " AND m.updated < :date")
+ em.createNamedQuery("resetMailStatusByDate")
.setParameter("noneStatus", Status.NONE)
.setParameter("sendingStatus", Status.SENDING)
.setParameter("date", date)
.executeUpdate();
}
+ public void resetSendingStatus(Long id) {
+ em.createNamedQuery("resetMailStatusById")
+ .setParameter("noneStatus", Status.NONE)
+ .setParameter("id", id)
+ .executeUpdate();
+ }
+
@Override
public MailMessage update(MailMessage m, Long userId) {
if (m.getId() == null) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Sat Apr 2 08:24:43 2016
@@ -40,6 +40,8 @@ import org.apache.openmeetings.db.entity
, @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "getMailMessagesByStatus", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m")
+ , @NamedQuery(name = "resetMailStatusByDate", query = "UPDATE MailMessage m SET m.status = :noneStatus WHERE m.status = :sendingStatus AND m.updated < :date")
+ , @NamedQuery(name = "resetMailStatusById", query = "UPDATE MailMessage m SET m.errorCount = 0, m.status = :noneStatus WHERE m.id = :id")
})
@Table(name = "email_queue")
public class MailMessage implements IDataProviderEntity {
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java Sat Apr 2 08:24:43 2016
@@ -19,24 +19,31 @@
package org.apache.openmeetings.web.admin.email;
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import java.util.Date;
+import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+
public class EmailForm extends Form<MailMessage> {
private static final long serialVersionUID = 1L;
private final DateLabel inserted;
private final DateLabel updated;
private final Label status;
+ private final AjaxButton reset;
- public EmailForm(String id, MailMessage m) {
+ public EmailForm(String id, final WebMarkupContainer list, MailMessage m) {
super(id, new CompoundPropertyModel<>(m));
add(status = new Label("status", Model.of("")));
add(new Label("subject"));
@@ -46,6 +53,16 @@ public class EmailForm extends Form<Mail
add(updated = forDatePattern("updated", Model.of((Date)null), WEB_DATE_PATTERN));
add(new Label("errorCount"));
add(new Label("lastError"));
+ add(reset = new AjaxButton("reset") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ getBean(MailMessageDao.class).resetSendingStatus(EmailForm.this.getModelObject().getId());
+ target.add(list);
+ }
+ });
+ reset.setEnabled(false);
}
@Override
@@ -55,5 +72,6 @@ public class EmailForm extends Form<Mail
status.setDefaultModelObject(getString("admin.email.status." + m.getStatus().name()));
inserted.setModelObject(m.getInserted().getTime());
updated.setModelObject(m.getInserted().getTime());
+ reset.setEnabled(m.getId() != null && MailMessage.Status.ERROR == m.getStatus());
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Sat Apr 2 08:24:43 2016
@@ -57,10 +57,11 @@
<label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span>
<label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span>
<label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span>
- <label><wicket:message key="admin.email.lastError" /></label><span class="input" wicket:id="lastError"></span>
+ <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span>
</div>
</fieldset>
</div>
+ <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button>
</form>
</div>
</div>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java Sat Apr 2 08:24:43 2016
@@ -80,7 +80,7 @@ public class EmailPanel extends AdminPan
add(container.getLinks());
add(navigator);
- form = new EmailForm("form", new MailMessage());
+ form = new EmailForm("form", list, new MailMessage());
add(form);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sat Apr 2 08:24:43 2016
@@ -1899,4 +1899,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sat Apr 2 08:24:43 2016
@@ -1883,4 +1883,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sat Apr 2 08:24:43 2016
@@ -1855,4 +1855,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sat Apr 2 08:24:43 2016
@@ -1877,4 +1877,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Sat Apr 2 08:24:43 2016
@@ -1891,4 +1891,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sat Apr 2 08:24:43 2016
@@ -1895,4 +1895,5 @@
<entry key="admin.email.body">ТекÑÑ</entry>
<entry key="admin.email.errorCount">ÐолиÑеÑÑво оÑибок</entry>
<entry key="admin.email.lastError">ÐоÑледнÑÑ Ð¾Ñибка</entry>
+ <entry key="admin.email.reset.status">СбÑоÑиÑÑ ÑÑаÑÑÑ</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sat Apr 2 08:24:43 2016
@@ -1859,4 +1859,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Sat Apr 2 08:24:43 2016
@@ -25,11 +25,12 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.PropertyModel;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+
public abstract class PagedEntityListPanel extends BasePanel {
private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
@@ -50,7 +51,7 @@ public abstract class PagedEntityListPan
Form<Void> searchForm = new Form<Void>("searchForm");
add(searchForm.setOutputMarkupId(true));
searchForm.add(new TextField<String>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
- searchForm.add(new AjaxButton("search", searchForm) {
+ AjaxButton b = new AjaxButton("search", searchForm) {
private static final long serialVersionUID = 1L;
@Override
@@ -58,7 +59,9 @@ public abstract class PagedEntityListPan
target.add(navPanel);
PagedEntityListPanel.this.onEvent(target);
}
- });
+ };
+ searchForm.add(b);
+ searchForm.setDefaultButton(b);
add(navPanel);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css Sat Apr 2 08:24:43 2016
@@ -345,4 +345,4 @@ table.adminListTable td div.four_column_
background-image: url(images/new.png);
background-repeat: no-repeat;
background-position: 5px;
-}
\ No newline at end of file
+}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css Sat Apr 2 08:24:43 2016
@@ -147,6 +147,10 @@ html, body {
padding: 1px 6px;
font-size: 12px;
}
+.searchForm input[type="button"] {
+ padding: .2em .5em;
+ font-size: smaller;
+}
.pagedEntityListPanel input, .adminForm .pagedEntityListPanel input {
font-size: 14px;
padding: 0px 0px;
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Sat Apr 2 08:24:43 2016
@@ -243,8 +243,9 @@ public class MailHandler {
log.error("Error while sending message", e);
m.setErrorCount(m.getErrorCount() + 1);
StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter(sw);
- pw.close();
+ try (PrintWriter pw = new PrintWriter(sw)) {
+ e.printStackTrace(pw);
+ }
m.setLastError(sw.getBuffer().toString());
m.setStatus(m.getErrorCount() < MAXIMUM_ERROR_COUNT ? Status.NONE : Status.ERROR);
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java Sat Apr 2 08:24:43 2016
@@ -23,10 +23,12 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
+import org.apache.wicket.util.string.Strings;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -50,9 +52,26 @@ public class MailMessageDao implements
.setFirstResult(start).setMaxResults(count).getResultList();
}
+ private <T> TypedQuery<T> getQuery(boolean isCount, String search, String order, Class<T> clazz) {
+ StringBuilder sb = new StringBuilder("SELECT ");
+ sb.append(isCount ? "COUNT(m)" : "m")
+ .append(" FROM MailMessage m");
+ if (!Strings.isEmpty(search)) {
+ sb.append(" WHERE m.recipients LIKE :search OR m.subject LIKE :search OR m.body LIKE :search OR m.lastError LIKE :search");
+ }
+ if (!Strings.isEmpty(order)) {
+ sb.append(" ORDER BY m.").append(order);
+ }
+ TypedQuery<T> q = em.createQuery(sb.toString(), clazz);
+ if (!Strings.isEmpty(search)) {
+ q.setParameter("search", String.format("%%%s%%", search));
+ }
+ return q;
+ }
+
@Override
public List<MailMessage> get(String search, int start, int count, String order) {
- return get(start, count);
+ return getQuery(false, search, order, MailMessage.class).setFirstResult(start).setMaxResults(count).getResultList();
}
@Override
@@ -62,18 +81,24 @@ public class MailMessageDao implements
@Override
public long count(String search) {
- return count();
+ return getQuery(true, search, null, Long.class).getSingleResult();
}
public void resetSendingStatus(Calendar date) {
- em.createQuery("UPDATE MailMessage m SET m.status = :noneStatus WHERE m.status = :sendingStatus " +
- " AND m.updated < :date")
+ em.createNamedQuery("resetMailStatusByDate")
.setParameter("noneStatus", Status.NONE)
.setParameter("sendingStatus", Status.SENDING)
.setParameter("date", date)
.executeUpdate();
}
+ public void resetSendingStatus(Long id) {
+ em.createNamedQuery("resetMailStatusById")
+ .setParameter("noneStatus", Status.NONE)
+ .setParameter("id", id)
+ .executeUpdate();
+ }
+
@Override
public MailMessage update(MailMessage m, Long userId) {
if (m.getId() == null) {
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/MailMessage.java Sat Apr 2 08:24:43 2016
@@ -40,6 +40,8 @@ import org.apache.openmeetings.db.entity
, @NamedQuery(name = "getMailMessages", query = "SELECT m FROM MailMessage m ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "getMailMessagesByStatus", query = "SELECT m FROM MailMessage m WHERE m.status = :status ORDER BY m.updated, m.inserted")
, @NamedQuery(name = "countMailMessages", query = "SELECT COUNT(m) FROM MailMessage m")
+ , @NamedQuery(name = "resetMailStatusByDate", query = "UPDATE MailMessage m SET m.status = :noneStatus WHERE m.status = :sendingStatus AND m.updated < :date")
+ , @NamedQuery(name = "resetMailStatusById", query = "UPDATE MailMessage m SET m.errorCount = 0, m.status = :noneStatus WHERE m.id = :id")
})
@Table(name = "email_queue")
public class MailMessage implements IDataProviderEntity {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java Sat Apr 2 08:24:43 2016
@@ -19,24 +19,31 @@
package org.apache.openmeetings.web.admin.email;
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import java.util.Date;
+import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+
public class EmailForm extends Form<MailMessage> {
private static final long serialVersionUID = 1L;
private final DateLabel inserted;
private final DateLabel updated;
private final Label status;
+ private final AjaxButton reset;
- public EmailForm(String id, MailMessage m) {
+ public EmailForm(String id, final WebMarkupContainer list, MailMessage m) {
super(id, new CompoundPropertyModel<>(m));
add(status = new Label("status", Model.of("")));
add(new Label("subject"));
@@ -46,6 +53,16 @@ public class EmailForm extends Form<Mail
add(updated = forDatePattern("updated", Model.of((Date)null), WEB_DATE_PATTERN));
add(new Label("errorCount"));
add(new Label("lastError"));
+ add(reset = new AjaxButton("reset") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ getBean(MailMessageDao.class).resetSendingStatus(EmailForm.this.getModelObject().getId());
+ target.add(list);
+ }
+ });
+ reset.setEnabled(false);
}
@Override
@@ -55,5 +72,6 @@ public class EmailForm extends Form<Mail
status.setDefaultModelObject(getString("admin.email.status." + m.getStatus().name()));
inserted.setModelObject(m.getInserted().getTime());
updated.setModelObject(m.getInserted().getTime());
+ reset.setEnabled(m.getId() != null && MailMessage.Status.ERROR == m.getStatus());
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.html Sat Apr 2 08:24:43 2016
@@ -57,10 +57,11 @@
<label><wicket:message key="1110" /></label><span class="input" wicket:id="inserted"></span>
<label><wicket:message key="1112" /></label><span class="input" wicket:id="updated"></span>
<label><wicket:message key="admin.email.errorCount" /></label><span class="input" wicket:id="errorCount"></span>
- <label><wicket:message key="admin.email.lastError" /></label><span class="input" wicket:id="lastError"></span>
+ <label><wicket:message key="admin.email.lastError" /></label><span style="white-space: pre;" class="input" wicket:id="lastError"></span>
</div>
</fieldset>
</div>
+ <button wicket:id="reset" style="float: right; margin-right: 20px;"><wicket:message key="admin.email.reset.status"/></button>
</form>
</div>
</div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java Sat Apr 2 08:24:43 2016
@@ -80,7 +80,7 @@ public class EmailPanel extends AdminPan
add(container.getLinks());
add(navigator);
- form = new EmailForm("form", new MailMessage());
+ form = new EmailForm("form", list, new MailMessage());
add(form);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Sat Apr 2 08:24:43 2016
@@ -1899,4 +1899,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Sat Apr 2 08:24:43 2016
@@ -1883,4 +1883,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Sat Apr 2 08:24:43 2016
@@ -1855,4 +1855,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Sat Apr 2 08:24:43 2016
@@ -1877,4 +1877,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Sat Apr 2 08:24:43 2016
@@ -1891,4 +1891,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Sat Apr 2 08:24:43 2016
@@ -1895,4 +1895,5 @@
<entry key="admin.email.body">ТекÑÑ</entry>
<entry key="admin.email.errorCount">ÐолиÑеÑÑво оÑибок</entry>
<entry key="admin.email.lastError">ÐоÑледнÑÑ Ð¾Ñибка</entry>
+ <entry key="admin.email.reset.status">СбÑоÑиÑÑ ÑÑаÑÑÑ</entry>
</properties>