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 870f381 no jira: code clean-up
870f381 is described below
commit 870f3813b7f8942d3017da1ac890f39875bc6088
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Oct 1 21:20:35 2018 +0700
no jira: code clean-up
---
.../java/org/apache/openmeetings/core/util/StrongPasswordValidator.java | 2 +-
.../src/main/java/org/apache/openmeetings/cli/Admin.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/app/Application.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +-
.../org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java | 2 +-
.../java/org/apache/openmeetings/web/room/RedirectMessageDialog.java | 2 +-
.../java/org/apache/openmeetings/web/room/RoomResourceReference.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 2 +-
.../apache/openmeetings/web/user/record/RecordingResourceReference.java | 2 +-
.../java/org/apache/openmeetings/web/util/ExtendedClientProperties.java | 2 +-
.../apache/openmeetings/service/mail/template/TestEmailTemplate.java | 2 +-
.../openmeetings/service/mail/template/subject/TestSubjTemplate.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
index 0147c9a..ca5a904 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
@@ -23,10 +23,10 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe
import java.util.Map;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.util.collections.MicroMap;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.ValidationError;
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
index 00cdfbb..aeb6245 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
@@ -42,7 +42,6 @@ import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.io.FileUtils;
-import org.apache.directory.api.util.Strings;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl;
import org.apache.openjpa.jdbc.schema.SchemaTool;
@@ -67,6 +66,7 @@ import org.apache.openmeetings.util.ImportHelper;
import org.apache.openmeetings.util.OmException;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.mail.MailUtil;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.Validatable;
import org.red5.logging.Red5LoggerFactory;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 8d4f556..294c1fc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -42,7 +42,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.service.MainService;
import org.apache.openmeetings.core.util.WebSocketHelper;
@@ -108,6 +107,7 @@ import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.info.PageComponentInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
import org.springframework.stereotype.Component;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index b53e94f..39e8b89 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -25,7 +25,6 @@ import static
org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.util.HashMap;
import java.util.Map;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.HeaderPanel;
import org.apache.openmeetings.web.util.OmUrlFragment;
@@ -42,6 +41,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage;
public abstract class BasePage extends AsyncUrlFragmentAwarePage {
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 efe9d05..5cf629f 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
@@ -29,7 +29,6 @@ import java.util.Date;
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.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
@@ -49,6 +48,7 @@ import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.apache.wicket.validation.Validatable;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
index 05ea4d1..59478f8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.room;
import java.util.ArrayList;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.NonClosableMessageDialog;
import org.apache.wicket.Component;
@@ -29,6 +28,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.model.IModel;
import org.apache.wicket.request.flow.RedirectToUrlException;
+import org.apache.wicket.util.string.Strings;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index 81ad1b5..36ae399 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -30,7 +30,6 @@ import static
org.apache.openmeetings.web.app.WebSession.getUserId;
import java.io.File;
import java.util.Map.Entry;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.dto.room.Whiteboard;
@@ -44,6 +43,7 @@ import
org.apache.openmeetings.web.util.FileItemResourceReference;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONObject;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 17c420e..395fc3d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -55,7 +55,6 @@ import java.util.function.Function;
import javax.imageio.ImageIO;
import org.apache.commons.codec.binary.Base64;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.dto.room.Whiteboard.ZoomMode;
@@ -86,6 +85,7 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
+import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index 32c6e64..da5d484 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -25,7 +25,6 @@ import static
org.apache.openmeetings.web.app.WebSession.getUserId;
import java.util.Map.Entry;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -42,6 +41,7 @@ import
org.apache.openmeetings.web.util.FileItemResourceReference;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.string.StringValue;
+import org.apache.wicket.util.string.Strings;
public abstract class RecordingResourceReference extends
FileItemResourceReference<Recording> {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
index fde8dd7..aeacc1e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
@@ -22,11 +22,11 @@ import static
org.apache.openmeetings.web.app.Application.HASH_MAPPING;
import static org.apache.openmeetings.web.app.Application.NOTINIT_MAPPING;
import static org.apache.openmeetings.web.app.Application.SIGNIN_MAPPING;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.wicket.protocol.http.ClientProperties;
import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.util.string.Strings;
import com.github.openjson.JSONObject;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
index 1b33366..302cd76 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
@@ -18,10 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
+import org.apache.wicket.util.string.Strings;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
index 1843010..613ee57 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
@@ -27,11 +27,11 @@ import java.util.Locale;
import java.util.TimeZone;
import java.util.function.Consumer;
-import org.apache.directory.api.util.Strings;
import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.wicket.util.string.Strings;
import org.junit.Test;
public class TestSubjTemplate extends AbstractWicketTester {
