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 65abcac [OPENMEETINGS-1898] code clean-up
new 54abcac Merge branch '4.0.x' of github.com:apache/openmeetings into
4.0.x
65abcac is described below
commit 65abcaca71ed45c6ce884dd79210b4b96bfebf32
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Jul 26 17:27:55 2018 +0700
[OPENMEETINGS-1898] code clean-up
---
.../org/apache/openmeetings/db/entity/user/User.java | 16 ----------------
openmeetings-web/pom.xml | 1 -
.../apache/openmeetings/web/common/GeneralUserForm.html | 3 ---
.../apache/openmeetings/web/common/GeneralUserForm.java | 2 --
.../apache/openmeetings/web/pages/auth/SignInPage.java | 2 +-
5 files changed, 1 insertion(+), 23 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
index 66b1839..910cee3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
@@ -273,10 +273,6 @@ public class User extends HistoricalEntity {
@Element(data = true, required = false)
private boolean forceTimeZoneCheck;
- @Column(name = "sendSMS", nullable = false)
- @Element(data = false, required = false)
- private boolean sendSMS;
-
@Column(name = "user_offers")
@Element(data = true, required = false)
private String userOffers;
@@ -518,14 +514,6 @@ public class User extends HistoricalEntity {
this.forceTimeZoneCheck = forceTimeZoneCheck;
}
- public boolean getSendSMS() {
- return sendSMS;
- }
-
- public void setSendSMS(boolean sendSMS) {
- this.sendSMS = sendSMS;
- }
-
public String getUserOffers() {
return userOffers;
}
@@ -558,10 +546,6 @@ public class User extends HistoricalEntity {
this.showContactDataToContacts = showContactDataToContacts;
}
- public String getPhoneForSMS() {
- return getSendSMS() ? getAddress().getPhone() : "";
- }
-
public Type getType() {
return type;
}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 6f8ee45..1d2331c 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -663,7 +663,6 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
<scope>test</scope>
</dependency>
<!--dependency> commented for Red5 lib substitution
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index 100a63e..e01e6a3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -41,9 +41,6 @@
<label wicket:for="address.phone"><wicket:message key="607"
/></label><input type="text" wicket:id="address.phone" />
</div>
<div class="formelement">
- <label wicket:for="sendSMS"><wicket:message key="1503"
/></label><input class="formcheckbox" type="checkbox" wicket:id="sendSMS" />
- </div>
- <div class="formelement">
<label wicket:for="age"><wicket:message key="138"
/></label><input type="text" class="date time picker" wicket:id="age"
style="width: 258px;" />
</div>
<div class="formelement">
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index 3209c13..f402f53 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -42,7 +42,6 @@ import
org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -100,7 +99,6 @@ public class GeneralUserForm extends Form<User> {
add(new DropDownChoice<>("timeZoneId", AVAILABLE_TIMEZONES));
add(new LanguageDropDown("languageId"));
add(new TextField<String>("address.phone"));
- add(new CheckBox("sendSMS"));
add(new AjaxDatePicker("age", new
PropertyModel<LocalDate>(this, "age"), WebSession.get().getLocale()) {
private static final long serialVersionUID = 1L;
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 920f3e9..3e42312 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
@@ -84,7 +84,7 @@ public class SignInPage extends BaseInitedPage {
try {
long serverId = oauthid.toLong(-1);
OAuthServer server =
getBean(OAuth2Dao.class).get(serverId);
- log.debug("OAuthServer=" + server);
+ log.debug("OAuthServer={}", server);
if (server == null) {
log.warn("OAuth server id={} not
found", serverId);
return;
