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 2015/12/10 17:37:54 UTC
svn commit: r1719108 - in /openmeetings/trunk/singlewebapp: ./
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/
openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/
openmeetings-web/src/main/java/org/apache/openmeet...
Author: solomax
Date: Thu Dec 10 16:37:53 2015
New Revision: 1719108
URL: http://svn.apache.org/viewvc?rev=1719108&view=rev
Log:
[OPENMEETINGS-980] wicket, wicketstuff and cxf versions are bumped
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Thu Dec 10 16:37:53 2015
@@ -27,15 +27,16 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.wicketstuff.select2.Response;
-import org.wicketstuff.select2.TextChoiceProvider;
+import org.wicketstuff.select2.ChoiceProvider;
-public abstract class AdminUserChoiceProvider extends TextChoiceProvider<User> {
+public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> {
private static final long serialVersionUID = 1L;
protected static int PAGE_SIZE = 20;
@Override
- protected Object getId(User choice) {
- return choice.getId();
+ public String getIdValue(User choice) {
+ Long id = choice.getId();
+ return id == null ? null : "" + id;
}
@Override
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Thu Dec 10 16:37:53 2015
@@ -63,7 +63,7 @@ public class GroupForm extends AdminBase
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(User choice) {
+ public String getDisplayValue(User choice) {
return formatUser(choice);
}
}));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Thu Dec 10 16:37:53 2015
@@ -66,10 +66,10 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2Choice;
import org.wicketstuff.select2.Select2MultiChoice;
-import org.wicketstuff.select2.TextChoiceProvider;
public class RoomForm extends AdminBaseForm<Room> {
private static final long serialVersionUID = 1L;
@@ -115,18 +115,19 @@ public class RoomForm extends AdminBaseF
for (Group org : orgList) {
orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new TextChoiceProvider<RoomGroup>() {
+ add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new ChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(RoomGroup choice) {
+ public String getDisplayValue(RoomGroup choice) {
String name = choice.getGroup().getName();
return name == null ? "" : name;
}
@Override
- protected Object getId(RoomGroup choice) {
- return choice.getGroup().getId();
+ public String getIdValue(RoomGroup choice) {
+ Long id = choice.getGroup().getId();
+ return id == null ? null : "" + id;
}
@Override
@@ -213,7 +214,7 @@ public class RoomForm extends AdminBaseF
}
@Override
- protected String getDisplayText(User choice) {
+ public String getDisplayValue(User choice) {
Address a = choice.getAddress();
return String.format("\"%s %s\" <%s>", choice.getFirstname(), choice.getLastname(), a == null ? "" : a.getEmail());
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Thu Dec 10 16:37:53 2015
@@ -64,9 +64,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
-import org.wicketstuff.select2.TextChoiceProvider;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
@@ -187,16 +187,16 @@ public class UserForm extends AdminBaseF
add(new CheckBox("forceTimeZoneCheck"));
- add(new Select2MultiChoice<Right>("rights", null, new TextChoiceProvider<Right>() {
+ add(new Select2MultiChoice<Right>("rights", null, new ChoiceProvider<Right>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(Right choice) {
+ public String getDisplayValue(Right choice) {
return choice.name();
}
@Override
- protected Object getId(Right choice) {
+ public String getIdValue(Right choice) {
return choice.name();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Thu Dec 10 16:37:53 2015
@@ -93,7 +93,6 @@ import org.apache.wicket.util.tester.Wic
import org.slf4j.Logger;
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.XmlWebApplicationContext;
-import org.wicketstuff.select2.ApplicationSettings;
import ro.fortsoft.wicket.dashboard.WidgetRegistry;
import ro.fortsoft.wicket.dashboard.web.DashboardContext;
@@ -125,7 +124,6 @@ public class Application extends Authent
//Resource Loader for a the property key
getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader());
- ApplicationSettings.get().setIncludeJqueryUI(false);
super.init();
// register some widgets
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Thu Dec 10 16:37:53 2015
@@ -59,9 +59,9 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.string.Strings;
import org.threeten.bp.LocalDate;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
-import org.wicketstuff.select2.TextChoiceProvider;
import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
import com.googlecode.wicket.kendo.ui.resource.KendoGlobalizeResourceReference;
@@ -134,17 +134,18 @@ public class GeneralUserForm extends For
} else {
orgUsers = getModelObject().getGroupUsers();
}
- add(new Select2MultiChoice<GroupUser>("groupUsers", null, new TextChoiceProvider<GroupUser>() {
+ add(new Select2MultiChoice<GroupUser>("groupUsers", null, new ChoiceProvider<GroupUser>() {
private static final long serialVersionUID = 1L;
@Override
- protected String getDisplayText(GroupUser choice) {
+ public String getDisplayValue(GroupUser choice) {
return choice.getGroup().getName();
}
@Override
- protected Object getId(GroupUser choice) {
- return choice.getGroup().getId();
+ public String getIdValue(GroupUser choice) {
+ Long id = choice.getGroup().getId();
+ return id == null ? null : "" + id;
}
@Override
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java Thu Dec 10 16:37:53 2015
@@ -22,8 +22,8 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getInvitationLink;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.app.WebSession.getRights;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
import java.util.ArrayList;
import java.util.Arrays;
@@ -72,9 +72,9 @@ import org.apache.wicket.model.util.Coll
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
-import org.wicketstuff.select2.TextChoiceProvider;
import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
@@ -105,7 +105,7 @@ public class InvitationDialog extends Ab
private final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<User>(new ArrayList<User>()));
private final Select2MultiChoice<Group> groups = new Select2MultiChoice<Group>("groups"
, new CollectionModel<Group>(new ArrayList<Group>())
- , new TextChoiceProvider<Group>() {
+ , new ChoiceProvider<Group>() {
private static final long serialVersionUID = 1L;
@Override
@@ -137,13 +137,14 @@ public class InvitationDialog extends Ab
}
@Override
- protected String getDisplayText(Group choice) {
+ public String getDisplayValue(Group choice) {
return choice.getName();
}
@Override
- protected Object getId(Group choice) {
- return choice.getId();
+ public String getIdValue(Group choice) {
+ Long id = choice.getId();
+ return id == null ? null : "" + id;
}
});
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Thu Dec 10 16:37:53 2015
@@ -37,7 +37,7 @@ import org.apache.wicket.validation.Vali
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
-public class UserChoiceProvider implements ChoiceProvider<User> {
+public class UserChoiceProvider extends ChoiceProvider<User> {
private static final long serialVersionUID = 1L;
private final static int PAGE_SIZE = 10;
private Map<String, User> newContacts = new Hashtable<String, User>();
@@ -76,7 +76,8 @@ public class UserChoiceProvider implemen
return u;
}
- protected Object getId(User u) {
+ @Override
+ public String getIdValue(User u) {
String id = "" + u.getId();
if (u.getId() == null) {
newContacts.put(u.getLogin(), u);
@@ -86,6 +87,11 @@ public class UserChoiceProvider implemen
}
@Override
+ public String getDisplayValue(User object) {
+ return FormatHelper.formatUser(object, true);
+ }
+
+ @Override
public void query(String term, int page, Response<User> response) {
User c = getUser(term);
if (c != null) {
@@ -112,10 +118,8 @@ public class UserChoiceProvider implemen
@Override
public void toJson(User choice, JSONWriter writer) throws JSONException {
- writer
- .key("id").value(getId(choice))
- .key("text").value(FormatHelper.formatUser(choice, true))
- .key("contact").value(choice.getType() == Type.contact);
+ super.toJson(choice, writer);
+ writer.key("contact").value(choice.getType() == Type.contact);
}
@Override
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1719108&r1=1719107&r2=1719108&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Thu Dec 10 16:37:53 2015
@@ -41,15 +41,15 @@
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
- <wicket.version>7.1.0</wicket.version>
+ <wicket.version>7.2.0-SNAPSHOT</wicket.version>
<wicketju.version>7.1.0</wicketju.version>
- <wickets.version>7.0.0</wickets.version>
+ <wickets.version>7.2.0-SNAPSHOT</wickets.version>
<red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
<ical4j.version>2.0-beta1</ical4j.version>
- <cxf.version>3.1.3</cxf.version>
+ <cxf.version>3.1.4</cxf.version>
<selenium.version>2.48.2</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
<jettison.version>1.3.5</jettison.version>