[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1864] tests should be fixed

2018-04-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new 2797b5e  [OPENMEETINGS-1864] tests should be fixed
2797b5e is described below

commit 2797b5ee69e5fe44a52b6f007f1d05d0089fcca0
Author: Maxim Solodovnik 
AuthorDate: Sat Apr 7 17:27:40 2018 +0700

[OPENMEETINGS-1864] tests should be fixed
---
 .../org/apache/openmeetings/core/ldap/LdapLoginManager.java   |  4 ++--
 .../apache/openmeetings/db/dao/basic/ConfigurationDao.java| 11 +++
 .../apache/openmeetings/installation/ImportInitvalues.java|  3 ++-
 .../org/apache/openmeetings/service/user/UserManager.java |  6 +++---
 .../org/apache/openmeetings/util/OpenmeetingsVariables.java   |  9 +
 .../org/apache/openmeetings/webservice/UserWebService.java|  8 +++-
 6 files changed, 34 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index ea16e07..e957177 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -24,7 +24,7 @@ import static 
org.apache.openmeetings.db.util.LocaleHelper.validateCountry;
 import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 import static org.apache.openmeetings.util.OmException.BAD_CREDENTIALS;
 import static org.apache.openmeetings.util.OmException.UNKNOWN;
-import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
 
 import java.io.Closeable;
@@ -345,7 +345,7 @@ public class LdapLoginManager {
u.setType(Type.ldap);
u.getRights().remove(Right.Login);
u.setDomainId(domainId);
-   Group g = 
groupDao.get(cfgDao.getLong(CONFIG_DEFAULT_GROUP_ID, null));
+   Group g = groupDao.get(getDefaultGroup());
if (g != null) {
u.getGroupUsers().add(new GroupUser(g, 
u));
}
diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index f3aa65f..561e233 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang3.math.NumberUtils.toInt;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_TIMEZONE;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
@@ -61,6 +62,7 @@ import static 
org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SSL_PORT;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_VIDEO_CODEC;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getRoomSettings;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
@@ -69,6 +71,7 @@ import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setAudioBitrate
 import static org.apache.openmeetings.util.OpenmeetingsVariables.setAudioRate;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.setBaseUrl;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setCryptClassName;
+import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setDefaultGroup;
 import static 
org.apache.openmeetings.util.OpenmeetingsVariables.setDefaultLang;
 import static

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1864] tests should we fixed

2018-04-06 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new a903d41  [OPENMEETINGS-1864] tests should we fixed
a903d41 is described below

commit a903d41fcb7d73432dd8ede979065b22ee6df472
Author: Maxim Solodovnik 
AuthorDate: Sat Apr 7 10:39:19 2018 +0700

[OPENMEETINGS-1864] tests should we fixed
---
 .../src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
index 97eae54..f8da684 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
@@ -216,8 +216,8 @@ public class UserDTO implements Serializable {
u.address.setEmail(a.optString("email"));
}
u.timeZoneId = o.optString("timeZoneId");
-   u.externalId = o.optString("externalId");
-   u.externalType = o.optString("externalType");
+   u.externalId = o.optString("externalId", null);
+   u.externalType = o.optString("externalType", null);
u.type = optEnum(Type.class, o, "type");
return u;
}

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1864] tests should we fixed

2018-04-06 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new 39032e3  [OPENMEETINGS-1864] tests should we fixed
39032e3 is described below

commit 39032e3ddf87a916facd2941a769a806c60c1fc6
Author: Maxim Solodovnik 
AuthorDate: Sat Apr 7 09:06:26 2018 +0700

[OPENMEETINGS-1864] tests should we fixed
---
 .../src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
index fdb1e15..97eae54 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
@@ -74,6 +74,7 @@ public class UserDTO implements Serializable {
 
public User get(UserDao userDao) {
User u = id == null ? new User() : userDao.get(id);
+   u.setLogin(login);
u.setFirstname(firstname);
u.setLastname(lastname);
u.setRights(rights);

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.