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/05/26 07:07:56 UTC
svn commit: r1745571 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/
branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/
trunk/openmeetings-db/src/main/java...
Author: solomax
Date: Thu May 26 07:07:56 2016
New Revision: 1745571
URL: http://svn.apache.org/viewvc?rev=1745571&view=rev
Log:
no jira: logging is improved to find reason for build failures
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1745571&r1=1745570&r2=1745571&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Thu May 26 07:07:56 2016
@@ -614,22 +614,26 @@ public class UserDao implements IDataPro
.setParameter("type", Type.user)
.getResultList();
- log.debug("debug SIZE: " + users.size());
+ log.debug("login:: {} users were found", users.size());
if (users.size() == 0) {
+ log.debug("No users was found: {}", userOrEmail);
throw new OmException(-10L);
}
User u = users.get(0);
if (!verifyPassword(u.getId(), userpass)) {
+ log.debug("Password does not match: {}", u);
throw new OmException(-11L);
}
// Check if activated
if (!AuthLevelUtil.hasLoginLevel(u.getRights())) {
+ log.debug("Not activated: {}", u);
throw new OmException(-41L);
}
log.debug("loginUser " + u.getGroupUsers());
if (u.getGroupUsers().isEmpty()) {
+ log.debug("No Group assigned: {}", u);
throw new OmException("No Group assigned to user");
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1745571&r1=1745570&r2=1745571&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Thu May 26 07:07:56 2016
@@ -614,22 +614,26 @@ public class UserDao implements IDataPro
.setParameter("type", Type.user)
.getResultList();
- log.debug("debug SIZE: " + users.size());
+ log.debug("login:: {} users were found", users.size());
if (users.size() == 0) {
+ log.debug("No users was found: {}", userOrEmail);
throw new OmException(-10L);
}
User u = users.get(0);
if (!verifyPassword(u.getId(), userpass)) {
+ log.debug("Password does not match: {}", u);
throw new OmException(-11L);
}
// Check if activated
if (!AuthLevelUtil.hasLoginLevel(u.getRights())) {
+ log.debug("Not activated: {}", u);
throw new OmException(-41L);
}
log.debug("loginUser " + u.getGroupUsers());
if (u.getGroupUsers().isEmpty()) {
+ log.debug("No Group assigned: {}", u);
throw new OmException("No Group assigned to user");
}
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1745571&r1=1745570&r2=1745571&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Thu May 26 07:07:56 2016
@@ -614,22 +614,26 @@ public class UserDao implements IDataPro
.setParameter("type", Type.user)
.getResultList();
- log.debug("debug SIZE: " + users.size());
+ log.debug("login:: {} users were found", users.size());
if (users.size() == 0) {
+ log.debug("No users was found: {}", userOrEmail);
throw new OmException(-10L);
}
User u = users.get(0);
if (!verifyPassword(u.getId(), userpass)) {
+ log.debug("Password does not match: {}", u);
throw new OmException(-11L);
}
// Check if activated
if (!AuthLevelUtil.hasLoginLevel(u.getRights())) {
+ log.debug("Not activated: {}", u);
throw new OmException(-41L);
}
log.debug("loginUser " + u.getGroupUsers());
if (u.getGroupUsers().isEmpty()) {
+ log.debug("No Group assigned: {}", u);
throw new OmException("No Group assigned to user");
}