[1/2] openmeetings git commit: no jira: more generic error message should be displayed on unsuccessful login

Fri, 19 May 2017 23:01:40 -0700 

Repository: openmeetings
Updated Branches:
  refs/heads/master ed74484ac -> 82df34434


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 5ddfc4d..8f17053 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">Zatvoriť</entry>
   <entry key="102">chyba vstupných údajov</entry>
   <entry key="103">Rozlíšujte veľké a malé písmena a minimálne 4 
znaky</entry>
-  <entry key="104">Heslo musí mať aspoň 4 znaky</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">Používateľské meno už existuje</entry>
   <entry key="106">Email už je zaregistrovaný</entry>
   <entry key="107">Systémová chyba, kontaktujte administrátora</entry>
@@ -336,7 +336,7 @@
   <entry key="318">Žiadny takýto email neexistuje. Uistite sa, že ste 
zadali rovnaký email ako pri registrácií.</entry>
   <entry key="319">Prosím zadajte email alebo používateľské meno</entry>
   <entry key="320">There is no user connected to this username</entry>
-  <entry key="321">Email bol zaslaný</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">Používateľ sa nenašiel</entry>
   <entry key="325">Resetovať vaše heslo</entry>
   <entry key="326">Prihlásenie</entry>
@@ -348,7 +348,7 @@
   <entry key="332">Heslo nastavené. Môžte sa prihlásiť.</entry>
   <entry key="333">OK</entry>
   <entry key="334">Chyba. Kontaktujte administrátora.</entry>
-  <entry key="335">Používateľské meno sa nenašlo</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Nesprávne heslo</entry>
   <entry key="337">Úspešne odhlásený</entry>
   <entry key="338">Registrácia nemožná</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 7dd7fcb..38b93e1 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">Stäng</entry>
   <entry key="102">Fel data angivet</entry>
   <entry key="103">Användarnamnet måste innehålla minst 4 tecken</entry>
-  <entry key="104">Lösenordet måste innehålla minst 4 tecken</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">Användarnamnet är redan använt</entry>
   <entry key="106">Denna epost är redan använd</entry>
   <entry key="107">Systemfel, kontakta systemadmin</entry>
@@ -336,7 +336,7 @@
   <entry key="318">Användare</entry>
   <entry key="319">Omröstningar</entry>
   <entry key="320">Det finns ingen Användare kopplad till detta 
Användarnamn</entry>
-  <entry key="321">Ett e-postmeddelande innehållande en unik länk har 
skickats till din epostadress, var vänlig kolla din epost. Om du fortfarande 
inte fått något e-postmeddelande, var vänlig ändra spaminställningarna 
för din e-post och skicka bekräftelsemeddelandet på nytt.</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">Ogiltig Hash. Ingen Användare Funnen.</entry>
   <entry key="325">Återställ Ditt Lösenord</entry>
   <entry key="326">Login</entry>
@@ -348,7 +348,7 @@
   <entry key="332">Lösenord valt. Du kan logga in nu.</entry>
   <entry key="333">OK</entry>
   <entry key="334">Okänt Fel. Var vänlig rapportera detta till ditt 
Service-Team.</entry>
-  <entry key="335">Användarnamnet hittades inte.</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Ogiltigt Lösenord.</entry>
   <entry key="337">Utloggning Lyckades.</entry>
   <entry key="338">Registrering via gränssnittet är Inaktiverat.</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 8c083c0..08b5642 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">ปิด</entry>
   <entry 
key="102">ข้อมูลที่กรอกขัดข้อง</entry>
   <entry key="103">ตัวอักษร 4 ตัวขึ้นไป 
อักษรตัวใหญ่มีผลสำคัญ</entry>
-  <entry 
key="104">รหัสผู้ใช้ต้องมีตัวอักษรอย่างน้อย
 4 ตัว</entry>
+  <entry key="104">Login is too short</entry>
   <entry 
key="105">มีผู้ใช้ชื่อนี้ไปแล้ว</entry>
   <entry 
key="106">อีเมล์นี้ลงทะเบียนไปแล้ว</entry>
   <entry key="107">ระบบขัดข้อง 
โปรดติดต่อผู้ดูแลระบบ</entry>
@@ -336,7 +336,7 @@
   <entry 
key="318">ไม่พบอีเมล์แอดเดรสดังกล่าว
 
ดูให้แน่ใจว่าคุณกรอกอีเมล์แอดเดรสเดียวกับที่คุณใช้ในการจัดทำบัญชีของคุณ</entry>
   <entry 
key="319">โปรดกรอกอีเมล์หรือชื่อผู้ใช้</entry>
   <entry 
key="320">ไม่มีผู้ใช้รายใดเชื่อมต่อกับชื่อผู้ใช้รายนี้</entry>
-  <entry 
key="321">ได้ส่งอีเมล์ซึ่งมีลิงค์พิเศษไปยังอีเมล์แอดเดรสของคุณแล้ว
 โปรดเช็คอีเมล์ด้วย 
หากยังคงไม่ได้รับอีเมล์ 
โปรดปรับการตั้งค่าอีเมล์สแปมและส่งอีเมล์ยืนยันใหม่อีกครั้ง</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">รหัสผ่านไม่ถูกต้อง 
ไม่พบผู้ใช้</entry>
   <entry 
key="325">ตั้งรหัสผ่านของคุณใหม่</entry>
   <entry key="326">ล็อคอิน</entry>
@@ -348,7 +348,7 @@
   <entry key="332">ตั้งรหัสผ่านแล้ว 
คุณสามารถล็อคอินได้แล้ว</entry>
   <entry key="333">ตกลง</entry>
   <entry 
key="334">ขัดข้องโดยไม่ทราบสาเหตุ 
โปรดรายงานต่อทีมบริการของคุณ</entry>
-  <entry key="335">ไม่พบชื่อผู้ใช้</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry 
key="336">รหัสผ่านไม่ถูกต้อง</entry>
   <entry 
key="337">ออกจากระบบเรียบร้อยแล้ว</entry>
   <entry 
key="338">การลงทะเบียนถูกยกเลิกแล้ว</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index fe66685..b835462 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">kapat</entry>
   <entry key="102">veri giriş hatası</entry>
   <entry key="103">4 ya da daha fazla karakter; büyük-küçük harfe 
duyarlı!</entry>
-  <entry key="104">Kullanıcı şifresi en az 4 karakter olmalıdır</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">Bu kullanıcı adı alınmış</entry>
   <entry key="106">Bu e-posta adresi zaten kayıtlı</entry>
   <entry key="107">Sistem hatası. Lütfen sistem yöneticileri ile 
bağlantıya geçiniz.</entry>
@@ -336,7 +336,7 @@
   <entry key="318">E-posta adresi bulunamadı. Kayıt esnasında 
kullandığınız e-posta adresini girdiğinizden emin olun.</entry>
   <entry key="319">Lütfen bir e-posta adresi ya da bir kullanıcı adı 
giriniz</entry>
   <entry key="320">Bu kullanıcı adı ile bağlanmış bir kullanıcı 
yok</entry>
-  <entry key="321">Özel bir bağlantıya sahip olan bir e-posta, e-posta 
adresinize yollanmış durumda. Lütfen posta kutunuzu kontrol edin. Eğer 
e-posta mesajını alamazsanız, lütfen posta kutunuzun gereksiz posta 
ayarlarını kontrol edin ve/veya yeniden doğrulama mesajının 
gönderilmesini sağlayın.</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">Geçersiz Komut. Hiçbir Kullanıcı Bulunamadı.</entry>
   <entry key="325">Şifrenizi Sıfırlayın</entry>
   <entry key="326">Oturum Aç</entry>
@@ -348,7 +348,7 @@
   <entry key="332">Şİfre belirlendi. Şuan oturum açabilirsiniz.</entry>
   <entry key="333">TAMAM</entry>
   <entry key="334">Bilinmeyen Hata. Lütfen bu durumu sistem sorumlusuna rapor 
ediniz.</entry>
-  <entry key="335">Kullanıcı adı bulunamadı</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Geçersiz Şifre</entry>
   <entry key="337">Oturum başarıyla kapatıldı</entry>
   <entry key="338">Geriplan kayıt işlemi devre dışı.</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index c516e28..13dc5ec 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -120,8 +120,8 @@
   <entry key="100">Еліпс</entry>
   <entry key="101">Закрити</entry>
   <entry key="102">Помилка при вводі</entry>
-  <entry key="103">Ім'я користувача повинно 
складатись мінімум з 4 знаків</entry>
-  <entry key="104">Пароль повинен містити мінімум 4 
знаки</entry>
+  <entry key="103">Password and/or login is too short</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">Це ім'я користувача вже 
присвоєне</entry>
   <entry key="106">Введена електронна адреса вже 
зареєстрована</entry>
   <entry key="107">Присутня помилка, просимо 
зв''язатись з адміністрацією</entry>
@@ -336,7 +336,7 @@
   <entry key="318">Користувачі</entry>
   <entry key="319">Опитування</entry>
   <entry key="320">Користувач з даним іменем 
відсутній</entry>
-  <entry key="321">На вашу поштоу скриньку вислано 
лист. Будь-ласка перевірте ваш поштову 
скриньку.</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">Неправильний хеш. Користувача 
не знайдено.</entry>
   <entry key="325">Скинути Ваш пароль</entry>
   <entry key="326">Логін</entry>
@@ -348,7 +348,7 @@
   <entry key="332">Пароль встановлено. Тепер ви 
можете ввійти.</entry>
   <entry key="333">OK</entry>
   <entry key="334">Невідома помилка. Будь-ласка 
зв'яжіться з адміністратором.</entry>
-  <entry key="335">Невідоме ім'я користувача</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">Невірний пароль</entry>
   <entry key="337">Ви успішно вийшли з системи</entry>
   <entry key="338">Попередня реєстрація 
вимкнена.</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index dae7e11..adfd44d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">关闭</entry>
   <entry key="102">输入错误</entry>
   <entry key="103">用户名必须长于4个字符</entry>
-  <entry key="104">用户密码必须长于4个字符</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">用户名已存在</entry>
   <entry key="106">邮件地址已注册</entry>
   <entry key="107">系统错误，请联系管理员</entry>
@@ -336,7 +336,7 @@
   <entry key="318">用户</entry>
   <entry key="319">投票</entry>
   <entry key="320">没有此用户名</entry>
-  <entry key="321">一封包含特殊链接的邮件已发送至你
的信箱,请查收.如果没有收到,请检查和调整你
的邮箱垃圾邮件设置,重新发送认证邮件.</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">无效的哈希值,没有该用户.</entry>
   <entry key="325">重置你的密码</entry>
   <entry key="326">登录</entry>
@@ -348,7 +348,7 @@
   <entry key="332">密码设置完毕,你可以登录.</entry>
   <entry key="333">完成</entry>
   <entry key="334">未知错误.</entry>
-  <entry key="335">未发现该用户名</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">无效密码</entry>
   <entry key="337">注销成功</entry>
   <entry key="338">禁止前端注册.</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 413cccd..04dbc65 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -121,7 +121,7 @@
   <entry key="101">關閉</entry>
   <entry key="102">輸入資料有誤</entry>
   <entry key="103">用戶名必須至少4個字符</entry>
-  <entry key="104">用戶密碼必須至少4個字符</entry>
+  <entry key="104">Login is too short</entry>
   <entry key="105">用戶台已被姶用</entry>
   <entry key="106">這電子郵件已註冊过了</entry>
   <entry key="107">系統錯誤 ,請聯繫系統管理員</entry>
@@ -336,7 +336,7 @@
   <entry key="318">用戶</entry>
   <entry key="319">民調</entry>
   <entry key="320">有沒有用戶連接到該用戶名</entry>
-  <entry 
key="321">該電郵載有一個特殊的聯繫已被發送到您的電子郵件地址，請檢查您的信箱。如果您還沒有收到郵件，請調整ä½
 çš„垃圾郵件設置，並重新發送確認郵件</entry>
+  <entry key="321">The email containing a special link has been sent to the 
email address, registered to the user corresponding to the data entered</entry>
   <entry key="324">無效散列。找不到用戶.</entry>
   <entry key="325">重置密碼</entry>
   <entry key="326">登錄</entry>
@@ -348,7 +348,7 @@
   <entry key="332">密碼設定。您可以立即登錄。</entry>
   <entry key="333">OK</entry>
   <entry key="334">未知錯誤。請告知您的服務團隊</entry>
-  <entry key="335">用戶名找不到</entry>
+  <entry key="335">Username/email and/or password are incorrect.</entry>
   <entry key="336">密碼無效</entry>
   <entry key="337">成功登出</entry>
   <entry key="338">前端登記禁用</entry>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 854154d..72939d8 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -112,7 +112,6 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
        private SOAPLogin soap = null;
        private Long roomId = null;
        private Long recordingId = null;
-       private Long loginError = null;
        private String externalType;
        private boolean kickedByAdmin = false;
        private ExtendedClientProperties extProps = new 
ExtendedClientProperties();
@@ -131,6 +130,7 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                SID = null;
                ISO8601FORMAT = null;
                sdf = null;
+               languageId = -1;
                i = null;
                soap = null;
                roomId = null;
@@ -138,7 +138,6 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                externalType = null;
                tz = null;
                browserTz = null;
-               loginError = null;
                browserLocale = null;
                extProps = new ExtendedClientProperties();
        }
@@ -169,9 +168,13 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                                        //no-op
                                }
                                // try to sign in the user
-                               if (!signIn(data[0], data[1], 
Type.valueOf(data[2]), domainId)) {
-                                       // the loaded credentials are wrong. 
erase them.
-                                       strategy.remove();
+                               try {
+                                       if (!signIn(data[0], data[1], 
Type.valueOf(data[2]), domainId)) {
+                                               // the loaded credentials are 
wrong. erase them.
+                                               strategy.remove();
+                                       }
+                               } catch (OmException e) {
+                                       //no-op, bad credentials
                                }
                        }
                }
@@ -322,33 +325,28 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                sdf = FastDateFormat.getDateTimeInstance(SHORT, SHORT, 
getLocale());
        }
 
-       public boolean signIn(String login, String password, Type type, Long 
domainId) {
-               try {
-                       User u = null;
-                       switch (type) {
-                               case ldap:
-                                       u = 
getBean(LdapLoginManagement.class).login(login, password, domainId);
-                                       break;
-                               case user:
-                                       /* we will allow login against internal 
DB in case user 'guess' LDAP password */
-                                       u = getBean(UserDao.class).login(login, 
password);
-                                       break;
-                               case oauth:
-                                       // we did all the checks at this stage, 
just set the user
-                                       u = 
getBean(UserDao.class).getByLogin(login, Type.oauth, domainId);
-                                       break;
-                               default:
-                                       throw new OmException(-1L);
-                       }
-                       if (u == null) {
-                               return false;
-                       }
-                       signIn(u);
-                       return true;
-               } catch (OmException oe) {
-                       loginError = oe.getCode() == null ? Long.valueOf(-1) : 
oe.getCode();
+       public boolean signIn(String login, String password, Type type, Long 
domainId) throws OmException {
+               User u = null;
+               switch (type) {
+                       case ldap:
+                               u = 
getBean(LdapLoginManagement.class).login(login, password, domainId);
+                               break;
+                       case user:
+                               /* we will allow login against internal DB in 
case user 'guess' LDAP password */
+                               u = getBean(UserDao.class).login(login, 
password);
+                               break;
+                       case oauth:
+                               // we did all the checks at this stage, just 
set the user
+                               u = getBean(UserDao.class).getByLogin(login, 
Type.oauth, domainId);
+                               break;
+                       default:
+                               throw new OmException(-1L);
                }
-               return false;
+               if (u == null) {
+                       return false;
+               }
+               signIn(u);
+               return true;
        }
 
        public boolean signIn(User u) {
@@ -359,10 +357,6 @@ public class WebSession extends 
AbstractAuthenticatedWebSession implements IWebS
                return true;
        }
 
-       public Long getLoginError() {
-               return loginError;
-       }
-
        public static WebSession get() {
                return (WebSession)AbstractAuthenticatedWebSession.get();
        }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
index 45b93a5..bed30fb 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
@@ -25,20 +25,18 @@ import 
org.apache.openmeetings.web.pages.auth.ResetPasswordDialog;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 public class ResetPage extends BaseNotInitedPage {
-       private static final long serialVersionUID = 1L;        
+       private static final long serialVersionUID = 1L;
        private final String RESET_PARAM = "hash";
-       
-       public ResetPage(PageParameters pp){
+
+       public ResetPage(PageParameters pp) {
                String resetHash = pp.get(RESET_PARAM).toString();
-               if (resetHash != null){
-                       Object user = 
Application.getBean(UserDao.class).getUserByHash(resetHash);
-                       if (user instanceof User){
-                               add(new ResetPasswordDialog("resetPassword", 
(User)user));
-                       } else {
-                               
setResponsePage(Application.get().getSignInPageClass());                
+               if (resetHash != null) {
+                       User user = 
Application.getBean(UserDao.class).getUserByHash(resetHash);
+                       if (user != null) {
+                               add(new ResetPasswordDialog("resetPassword", 
user));
+                               return;
                        }
-               } else {
-                       
setResponsePage(Application.get().getSignInPageClass());                
                }
+               setResponsePage(Application.get().getSignInPageClass());
        }
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 0767e03..6adb603 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -25,10 +25,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.directory.api.util.Strings;
 import org.apache.openmeetings.core.mail.MailHandler;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.util.UserHelper;
 import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.pages.ResetPage;
@@ -37,6 +39,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import 
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.Radio;
@@ -46,6 +49,9 @@ import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.validation.IValidatable;
+import org.apache.wicket.validation.IValidator;
+import org.apache.wicket.validation.Validatable;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 
@@ -58,9 +64,10 @@ import 
com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
 public class ForgetPasswordDialog extends AbstractFormDialog<String> {
        private static final Logger log = 
Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
        private static final long serialVersionUID = 1L;
-       private DialogButton send = new DialogButton("send", 
Application.getString(317));
-       private DialogButton cancel = new DialogButton("cancel", 
Application.getString(122));
+       private final DialogButton send = new DialogButton("send", 
Application.getString(317));
+       private final DialogButton cancel = new DialogButton("cancel", 
Application.getString(122));
        private final KendoFeedbackPanel feedback = new 
KendoFeedbackPanel("feedback", new Options("button", true));
+       private final IValidator<String> emailValidator = 
RfcCompliantEmailAddressValidator.getInstance();
        private RequiredTextField<String> nameField;
        private Form<String> form;
        private SignInDialog s;
@@ -116,14 +123,17 @@ public class ForgetPasswordDialog extends 
AbstractFormDialog<String> {
 
                        @Override
                        protected void onValidate() {
-                               UserDao dao = getBean(UserDao.class);
                                String n = nameField.getConvertedInput();
                                if (n != null) {
-                                       if (type == Type.email && null == 
dao.getByEmail(n)) {
-                                               
error(Application.getString(318));
+                                       IValidatable<String> val = new 
Validatable<>(n);
+                                       if (type == Type.email) {
+                                               emailValidator.validate(val);
+                                               if (!val.isValid()) {
+                                                       error(getString("234"));
+                                               }
                                        }
-                                       if (type == Type.login && null == 
dao.getByLogin(n, User.Type.user, null)) {
-                                               
error(Application.getString(320));
+                                       if (type == Type.login && n.length() < 
UserHelper.getMinLoginLength(getBean(ConfigurationDao.class))) {
+                                               error(getString("104"));
                                        }
                                }
                        }
@@ -196,36 +206,31 @@ public class ForgetPasswordDialog extends 
AbstractFormDialog<String> {
         * @param email
         * @param username
         * @param appLink
-        * @return
+        * @return <code>true</code> in case reset was successful, 
<code>false</code> otherwise
         */
-       private static Long resetUser(String email, String username, String 
appLink) {
+       private static boolean resetUser(String email, String username, String 
appLink) {
                try {
                        UserDao userDao = getBean(UserDao.class);
                        log.debug("resetUser " + email);
 
                        // check if Mail given
-                       if (email.length() > 0) {
+                       if (!Strings.isEmpty(email)) {
                                User us = userDao.getByEmail(email);
                                if (us != null) {
                                        sendHashByUser(us, appLink, userDao);
-                                       return new Long(-4);
-                               } else {
-                                       return new Long(-9);
+                                       return true;
                                }
-                       } else if (username.length() > 0) {
+                       } else if (!Strings.isEmpty(username)) {
                                User us = userDao.getByLogin(username, 
User.Type.user, null);
                                if (us != null) {
                                        sendHashByUser(us, appLink, userDao);
-                                       return new Long(-4);
-                               } else {
-                                       return new Long(-3);
+                                       return true;
                                }
                        }
                } catch (Exception e) {
                        log.error("[resetUser]", e);
-                       return new Long(-1);
                }
-               return new Long(-2);
+               return false;
        }
 
        private static void sendHashByUser(User us, String appLink, UserDao 
userDao) {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
index b557713..b526eb8 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html
@@ -7,44 +7,36 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
       http://www.apache.org/licenses/LICENSE-2.0
-         
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <html xmlns:wicket="http://wicket.apache.org";>
 <wicket:panel>
        <form wicket:id="form">
                <table>
                        <tr>
-                               <td class="desc"><wicket:message key="117" 
/></td>
-                               <td><input wicket:id="firstName" type="text" 
value="" /></td>
-                       </tr>
-                       <tr>
-                               <td class="desc"><wicket:message key="118" 
/></td>
-                               <td><input wicket:id="lastName" type="text" 
value="" /></td>
-                       </tr>
-                       <tr>
                                <td class="desc"><wicket:message key="114" 
/></td>
                                <td><input wicket:id="login" type="text" 
value="" /></td>
                        </tr>
                        <tr>
-                               <td class="desc"><wicket:message key="115" 
/></td>
-                               <td><input wicket:id="password" type="password" 
value="" /></td>
+                               <td class="desc"><wicket:message key="119" 
/></td>
+                               <td><input wicket:id="email" type="text" 
value="" /></td>
                        </tr>
                        <tr>
-                               <td class="desc"><wicket:message key="116" 
/></td>
-                               <td><input wicket:id="confirmPassword" 
type="password" value="" /></td>
+                               <td><input wicket:id="firstName" type="text" 
wicket:message="placeholder:117" value="" /></td>
+                               <td><input wicket:id="lastName" type="text" 
wicket:message="placeholder:118" value="" /></td>
                        </tr>
                        <tr>
-                               <td class="desc"><wicket:message key="119" 
/></td>
-                               <td><input wicket:id="email" type="text" 
value="" /></td>
+                               <td><input wicket:id="password" type="password" 
wicket:message="placeholder:115" value="" /></td>
+                               <td><input wicket:id="confirmPassword" 
type="password" wicket:message="placeholder:116" value="" /></td>
                        </tr>
                        <tr>
                                <td class="desc"><wicket:message key="1143" 
/></td>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index b2fc869..9f793c0 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -144,7 +144,7 @@ public class RegisterDialog extends 
NonClosableDialog<String> {
                } else if (sendConfirmation) {
                        messageCode = 1591;
                }
-               
confirmRegistration.setModelObject(Application.getString(messageCode));
+               confirmRegistration.setModelObject(getString("" + messageCode));
                reset();
                handler.add(form);
        }
@@ -212,32 +212,29 @@ public class RegisterDialog extends 
NonClosableDialog<String> {
                public RegisterForm(String id) {
                        super(id);
                        add(feedback.setOutputMarkupId(true));
-                       ConfigurationDao cfgDao = 
getBean(ConfigurationDao.class);
-                       add(firstNameField = new 
RequiredTextField<>("firstName", new PropertyModel<String>(
-                                       RegisterDialog.this, "firstName")));
-                       
firstNameField.setLabel(Model.of(Application.getString(117)));
-                       add(lastNameField = new RequiredTextField<>("lastName", 
new PropertyModel<String>(
-                                       RegisterDialog.this, "lastName")));
-                       
lastNameField.setLabel(Model.of(Application.getString(118)));
-                       add(loginField = new RequiredTextField<>("login", new 
PropertyModel<String>(RegisterDialog.this,
-                                       "login")));
-                       
loginField.setLabel(Model.of(Application.getString(114)));
-                       
loginField.add(minimumLength(getMinLoginLength(cfgDao)));
-                       add(passwordField = new PasswordTextField("password", 
new PropertyModel<String>(RegisterDialog.this,
-                                       "password")));
-                       
passwordField.setLabel(Model.of(Application.getString(115)));
-                       
passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao)));
+                       add(firstNameField = new 
RequiredTextField<>("firstName", new PropertyModel<String>(RegisterDialog.this, 
"firstName")));
+                       add(lastNameField = new RequiredTextField<>("lastName", 
new PropertyModel<String>(RegisterDialog.this, "lastName")));
+                       add(loginField = new RequiredTextField<>("login", new 
PropertyModel<String>(RegisterDialog.this, "login")));
+                       add(passwordField = new PasswordTextField("password", 
new PropertyModel<String>(RegisterDialog.this, "password")));
                        add(confirmPassword = new 
PasswordTextField("confirmPassword", new 
Model<String>()).setResetPassword(true));
-                       
confirmPassword.setLabel(Model.of(Application.getString(116)));
-                       add(emailField = new RequiredTextField<>("email", new 
PropertyModel<String>(RegisterDialog.this,
-                                       "email")));
-                       
emailField.setLabel(Model.of(Application.getString(119)));
-                       
emailField.add(RfcCompliantEmailAddressValidator.getInstance());
+                       add(emailField = new RequiredTextField<>("email", new 
PropertyModel<String>(RegisterDialog.this, "email")));
                        add(langField = new LanguageDropDown("lang", new 
PropertyModel<Long>(RegisterDialog.this, "lang")));
-                       
langField.setRequired(true).setLabel(Model.of(Application.getString(111)));
-                       
add(tzDropDown.setRequired(true).setLabel(Model.of(Application.getString(1143))));
+               }
+
+               @Override
+               protected void onInitialize() {
+                       super.onInitialize();
+                       ConfigurationDao cfgDao = 
getBean(ConfigurationDao.class);
+                       firstNameField.setLabel(Model.of(getString("117")));
+                       lastNameField.setLabel(Model.of(getString("118")));
+                       
loginField.add(minimumLength(getMinLoginLength(cfgDao))).setLabel(Model.of(getString("114")));
+                       
passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao))).setLabel(Model.of(getString("115")));
+                       confirmPassword.setLabel(Model.of(getString("116")));
+                       
emailField.add(RfcCompliantEmailAddressValidator.getInstance()).setLabel(Model.of(getString("119")));
+                       
langField.setRequired(true).setLabel(Model.of(getString("111")));
+                       
add(tzDropDown.setRequired(true).setLabel(Model.of(getString("1143"))));
                        add(countryField = new CountryDropDown("country", new 
PropertyModel<String>(RegisterDialog.this, "country")));
-                       
countryField.setRequired(true).setLabel(Model.of(Application.getString(120)));
+                       
countryField.setRequired(true).setLabel(Model.of(getString("120")));
                        add(new AjaxButton("submit") { // FAKE button so 
"submit-on-enter" works as expected
                                private static final long serialVersionUID = 1L;
 
@@ -257,13 +254,13 @@ public class RegisterDialog extends 
NonClosableDialog<String> {
                protected void onValidate() {
                        if (passwordField.getConvertedInput() == null
                                        || 
!passwordField.getConvertedInput().equals(confirmPassword.getConvertedInput())) 
{
-                               error(Application.getString(232));
+                               error(getString("232"));
                        }
                        if 
(!getBean(UserDao.class).checkEmail(emailField.getConvertedInput(), 
User.Type.user, null, null)) {
-                               error(Application.getString(1000));
+                               error(getString("1000"));
                        }
                        if 
(!getBean(UserDao.class).checkLogin(loginField.getConvertedInput(), 
User.Type.user, null, null)) {
-                               error(Application.getString(105));
+                               error(getString("105"));
                        }
                }
        }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 4349a8f..ecfbb78 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -33,10 +33,10 @@ import 
org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.dao.basic.ErrorDao;
 import org.apache.openmeetings.db.dao.server.LdapConfigDao;
 import org.apache.openmeetings.db.dao.server.OAuth2Dao;
-import org.apache.openmeetings.db.entity.basic.ErrorValue;
 import org.apache.openmeetings.db.entity.server.LdapConfig;
 import org.apache.openmeetings.db.entity.server.OAuthServer;
 import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
 import org.apache.openmeetings.web.app.WebSession;
@@ -172,7 +172,14 @@ public class SignInDialog extends 
NonClosableDialog<String> {
                OmAuthenticationStrategy strategy = getAuthenticationStrategy();
                WebSession ws = WebSession.get();
                Type type = domain.getId() > 0 ? Type.ldap : Type.user;
-               if (ws.signIn(login, password, type, domain.getId())) {
+               boolean signIn = false;
+               try {
+                       signIn = ws.signIn(login, password, type, 
domain.getId());
+               } catch (OmException e) {
+                       error(e.getCode() == null ? e.getMessage() : 
getBean(ErrorDao.class).getMessage(e.getCode(), ws.getOmLanguage()));
+                       target.add(feedback);
+               }
+               if (signIn) {
                        setResponsePage(Application.get().getHomePage());
                        if (rememberMe) {
                                strategy.save(login, password, type, 
domain.getId());
@@ -180,14 +187,11 @@ public class SignInDialog extends 
NonClosableDialog<String> {
                                strategy.remove();
                        }
                } else {
-                       strategy.remove();
-                       if (ws.getLoginError() != null) {
-                               ErrorValue eValue = 
getBean(ErrorDao.class).get(-1 * ws.getLoginError());
-                               if (eValue != null) {
-                                       
error(Application.getString(eValue.getLabelId()));
-                                       target.add(feedback);
-                               }
+                       if (!hasErrorMessage()) {
+                               error(getString("335"));
+                               target.add(feedback);
                        }
+                       strategy.remove();
                        shake(target);
                }
        }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index fbfb409..8215e6d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -54,6 +54,7 @@ import org.apache.openmeetings.db.dao.user.IUserManager;
 import org.apache.openmeetings.db.entity.server.OAuthServer;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.pages.BaseInitedPage;
@@ -123,10 +124,14 @@ public class SignInPage extends BaseInitedPage {
                IRequestParameters pp = 
RequestCycle.get().getRequest().getPostParameters();
                StringValue login = pp.getParameterValue("login"), password = 
pp.getParameterValue("password");
                if (!login.isEmpty() && !password.isEmpty()) {
-                       if (WebSession.get().signIn(login.toString(), 
password.toString(), Type.user, null)) {
-                               
setResponsePage(Application.get().getHomePage());
-                       } else {
-                               log.error("Failed to login using POST 
parameters passed");
+                       try {
+                               if (WebSession.get().signIn(login.toString(), 
password.toString(), Type.user, null)) {
+                                       
setResponsePage(Application.get().getHomePage());
+                               } else {
+                                       log.error("Failed to login using POST 
parameters passed");
+                               }
+                       } catch (OmException e) {
+                               log.error("Exception while login with POST 
parameters passed", e);
                        }
                }
 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/main/webapp/languages/errorvalues.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/languages/errorvalues.xml 
b/openmeetings-web/src/main/webapp/languages/errorvalues.xml
index c46a27a..b152faa 100644
--- a/openmeetings-web/src/main/webapp/languages/errorvalues.xml
+++ b/openmeetings-web/src/main/webapp/languages/errorvalues.xml
@@ -7,465 +7,385 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
       http://www.apache.org/licenses/LICENSE-2.0
-         
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
+
 -->
 <ROOT xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
-    xsi:noNamespaceSchemaLocation="errorvalues.xsd">
-    <row>
-      <field name="errorvalues_id">1</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">334</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">2</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">319</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">3</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">320</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">4</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">321</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">5</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">324</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">6</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">330</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">7</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">331</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">8</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">332</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">9</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">318</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">10</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">335</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">11</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">336</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">12</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">337</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">13</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">103</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">14</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">338</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">15</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">105</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">16</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">107</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">17</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">106</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">18</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">236</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">19</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">339</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">20</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">340</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">21</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">341</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">22</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">342</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">23</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">343</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">24</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">345</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">25</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">346</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">26</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">347</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">27</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">358</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">28</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">357</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">29</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">358</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">30</field>
-      <field name="starttime">2007-12-06 19:01:07</field>
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">403</field>
-      <field name="type">info</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">31</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">533</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">32</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">534</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">33</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">535</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">34</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">538</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">35</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">276</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">36</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">664</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">37</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">665</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">38</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">663</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">39</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">666</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">40</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">674</field>
-      <field name="type">info</field>
-    </row>  
-    <row>
-      <field name="errorvalues_id">41</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">673</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">42</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">787</field>
-      <field name="type">error</field>
-    </row>  
-    <row>
-      <field name="errorvalues_id">43</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">920</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">44</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1000</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">45</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1195</field>
-      <field name="type">error</field>
-    </row> 
-    <row>
-      <field name="errorvalues_id">46</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1226</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">47</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1227</field>
-      <field name="type">error</field>
-    </row>             
-    <row>
-      <field name="errorvalues_id">48</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1228</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">49</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1231</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">50</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1271</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">51</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1309</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">52</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1310</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">53</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1416</field>
-      <field name="type">error</field>
-    </row>     
-    <row>
-      <field name="errorvalues_id">54</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1431</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">55</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1540</field>
-      <field name="type">error</field>
-    </row>
-    <row>
-      <field name="errorvalues_id">56</field>
-      <field name="starttime" />
-      <field name="updatetime" />
-      <field name="deleted">false</field>
-      <field name="fieldvalues_id">1544</field>
-      <field name="type">error</field>
-    </row>
+               xsi:noNamespaceSchemaLocation="errorvalues.xsd">
+       <row>
+               <field name="errorvalues_id">1</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">334</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">10</field>
+               <field name="starttime">2017-05-18 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">335</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">13</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">103</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">14</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">338</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">15</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">105</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">16</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">107</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">17</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">106</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">18</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">236</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">19</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">339</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">20</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">340</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">21</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">341</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">22</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">342</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">23</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">343</field>
+               <field name="type">info</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">24</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">345</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">25</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">346</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">26</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">347</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">27</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">358</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">28</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">357</field>
+               <field name="type">info</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">29</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">358</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">30</field>
+               <field name="starttime">2007-12-06 19:01:07</field>
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">403</field>
+               <field name="type">info</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">31</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">533</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">32</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">534</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">33</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">535</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">34</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">538</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">35</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">276</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">36</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">664</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">37</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">665</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">38</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">663</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">39</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">666</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">40</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">674</field>
+               <field name="type">info</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">41</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">673</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">42</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">787</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">43</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">920</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">44</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1000</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">45</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1195</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">46</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1226</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">47</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1227</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">48</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1228</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">49</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1231</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">50</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1271</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">51</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1309</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">52</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1310</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">53</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1416</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">54</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1431</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">55</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1540</field>
+               <field name="type">error</field>
+       </row>
+       <row>
+               <field name="errorvalues_id">56</field>
+               <field name="starttime" />
+               <field name="updatetime" />
+               <field name="deleted">false</field>
+               <field name="fieldvalues_id">1544</field>
+               <field name="type">error</field>
+       </row>
 </ROOT>

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
index bcf8aad..5c1c6a3 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractWicketTester.java
@@ -21,11 +21,13 @@ package org.apache.openmeetings.test;
 import static 
org.apache.openmeetings.db.util.ApplicationHelper.getWicketTester;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.Serializable;
 import java.util.List;
 
 import org.apache.openmeetings.db.entity.user.User.Type;
+import org.apache.openmeetings.util.OmException;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.wicket.util.lang.Args;
 import org.apache.wicket.util.tester.WicketTester;
@@ -45,12 +47,17 @@ public class AbstractWicketTester extends 
AbstractJUnitDefaults {
        }
 
        public void login(String login, String password) {
-               if (login != null && password != null) {
-                       WebSession.get().signIn(login, password, Type.user, 
null);
-               } else {
-                       WebSession.get().signIn(username, userpass, Type.user, 
null);
+               WebSession s = WebSession.get();
+               try {
+                       if (login != null && password != null) {
+                               s.signIn(login, password, Type.user, null);
+                       } else {
+                               s.signIn(username, userpass, Type.user, null);
+                       }
+               } catch (OmException e) {
+                       fail(e.getMessage());
                }
-               assertTrue("Web session is not signed in for user: " + (login 
!= null ? login : username), WebSession.get().isSignedIn());
+               assertTrue("Web session is not signed in for user: " + (login 
!= null ? login : username), s.isSignedIn());
        }
 
        @After

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/82df3443/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
----------------------------------------------------------------------
diff --git 
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
 
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
index c3914a6..56a8572 100644
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
@@ -47,7 +47,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public class TestOldBackups extends AbstractJUnitDefaults {
        private static final Logger log = 
Red5LoggerFactory.getLogger(TestOldBackups.class, webAppRootKey);
-       
+
        @Autowired
        private BackupImport backupController;
        @Autowired
@@ -70,7 +70,7 @@ public class TestOldBackups extends AbstractJUnitDefaults {
                // Crypt class need to be preserved here to avoid overriding by 
backup import
                cryptClass = cfgDao.getCryptKey();
        }
-       
+
        @After
        public void tearDown() {
                List<Configuration> cfgs = cfgDao.get(CONFIG_CRYPT_KEY);
@@ -80,12 +80,12 @@ public class TestOldBackups extends AbstractJUnitDefaults {
                c.setValue(cryptClass);
                cfgDao.update(c, null);
        }
-       
+
        @Test
        public void importOldVersions() {
                String backupsDir = System.getProperty("backups.dir", ".");
                File backupsHome = new File(backupsDir);
-               
+
                if (!backupsHome.exists() || !backupsHome.isDirectory()) {
                        fail("Invalid directory is specified for backup files: 
" + backupsDir);
                }
@@ -112,7 +112,7 @@ public class TestOldBackups extends AbstractJUnitDefaults {
                                assertTrue("Zero room groups were imported from 
" + name, newRoomGroupCount > roomGroupCount);
                                assertTrue("Zero appointments were imported 
from " + name, newApptCount > apptCount);
                                assertTrue("Zero meeting members were imported 
from " + name, newMeetingMembersCount > meetingMembersCount);
-                               
+
                                groupCount = newGroupCount;
                                userCount = newUserCount;
                                roomCount = newRoomCount;

Reply via email to