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 2018/05/10 14:04:30 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1870] basic
refactoring
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 8b1b592 [OPENMEETINGS-1870] basic refactoring
8b1b592 is described below
commit 8b1b5921bbac06b3ca848d06f050ee652ac98ac5
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu May 10 21:04:19 2018 +0700
[OPENMEETINGS-1870] basic refactoring
---
openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as | 2 +-
.../src/main/java/org/apache/openmeetings/web/app}/UserManager.java | 6 ++----
.../java/org/apache/openmeetings/webservice/UserWebService.java | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
index cd0a0e8..01aa560 100644
--- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
+++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as
@@ -271,7 +271,7 @@ public class OmVideo {
debug("sendVarsToMessageWithClient :: ", obj);
if ("copiedText" === obj[0]) {
ExternalInterface.call("Room.showClipboard", obj[1]);
- } else if ("quit" === obj["message"]) {
+ } else if ("quit" === obj["message"] || "kick" === obj["message"]) {
reset();
}
}
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
similarity index 98%
rename from openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index 6026409..a65f32a 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.service.user;
+package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.db.dao.user.UserDao.getNewUserInstance;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
@@ -89,9 +89,7 @@ public class UserManager implements IUserManager {
private boolean sendConfirmation() {
String baseURL = getBaseUrl();
- return baseURL != null
- && !baseURL.isEmpty()
- && cfgDao.getBool(CONFIG_EMAIL_VERIFICATION, false);
+ return !Strings.isEmpty(baseURL) && cfgDao.getBool(CONFIG_EMAIL_VERIFICATION, false);
}
/**
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index 3666c18..c30cbe9 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -61,7 +61,6 @@ import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.manager.IClientManager;
-import org.apache.openmeetings.service.user.UserManager;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.webservice.error.ServiceException;
import org.apache.wicket.util.string.Strings;
@@ -189,7 +188,7 @@ public class UserWebService extends BaseWebService {
User u = user.get(userDao);
GroupDao groupDao = getBean(GroupDao.class);
u.getGroupUsers().add(new GroupUser(groupDao.get(getDefaultGroup()), u));
- _user = getBean(UserManager.class).registerUser(u, user.getPassword(), null);
+ _user = getBean(IUserManager.class).registerUser(u, user.getPassword(), null);
} catch (NoSuchAlgorithmException | OmException e) {
throw new ServiceException("Unexpected error while creating user");
}
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.