[OPENMEETINGS-1612] wicket, wicketstuff and openjson versions are updated
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e6940fa5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e6940fa5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e6940fa5 Branch: refs/heads/3.2.x Commit: e6940fa50425cfc822da19dceccf038d2a0d5bc8 Parents: d532ba9 Author: Maxim Solodovnik <[email protected]> Authored: Thu Mar 30 02:58:18 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Mar 30 02:58:18 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/core/util/WebSocketHelper.java | 5 +++-- .../org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java | 3 ++- .../apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java | 3 ++- .../main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java | 3 ++- .../org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java | 3 ++- .../org/apache/openmeetings/db/dto/user/ExternalUserDTO.java | 2 +- .../main/java/org/apache/openmeetings/db/dto/user/UserDTO.java | 3 ++- .../main/java/org/apache/openmeetings/db/util/DtoHelper.java | 4 ++-- .../org/apache/openmeetings/web/common/tree/FileItemTree.java | 3 ++- .../org/apache/openmeetings/web/common/tree/FileTreePanel.java | 5 ++--- .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 3 ++- .../main/java/org/apache/openmeetings/web/room/SwfPanel.java | 5 +++-- .../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +- .../apache/openmeetings/web/user/calendar/CalendarPanel.java | 4 ++-- .../main/java/org/apache/openmeetings/web/user/chat/Chat.java | 2 +- .../apache/openmeetings/web/util/ExtendedClientProperties.java | 3 ++- .../org/apache/openmeetings/web/util/UserChoiceProvider.java | 5 +++-- openmeetings-web/src/main/webapp/css/room.css | 1 + .../openmeetings/test/webservice/TestCalendarService.java | 5 +++-- .../apache/openmeetings/test/webservice/TestWebConverters.java | 3 ++- .../webservice/util/AppointmentListMessageBodyWriter.java | 5 +++-- .../webservice/util/AppointmentMessageBodyWriter.java | 3 ++- .../openmeetings/webservice/util/AppointmentParamConverter.java | 5 +++-- pom.xml | 4 ++-- 24 files changed, 50 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java index 74bc93b..3994551 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java @@ -43,11 +43,12 @@ import org.apache.wicket.protocol.ws.api.IWebSocketConnection; import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry; import org.apache.wicket.protocol.ws.api.registry.PageIdKey; import org.apache.wicket.protocol.ws.concurrent.Executor; -import org.json.JSONArray; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; + public class WebSocketHelper { private static final Logger log = Red5LoggerFactory.getLogger(WebSocketHelper.class, webAppRootKey); public static final String ID_TAB_PREFIX = "chatTab-"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java index aabb166..9a73a10 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/AppointmentDTO.java @@ -37,7 +37,8 @@ import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.user.User; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java index df211cb..69131e8 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/calendar/MeetingMemberDTO.java @@ -31,7 +31,8 @@ import org.apache.openmeetings.db.dto.user.UserDTO; import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.user.User; import org.apache.wicket.util.string.Strings; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java index 1e3b1a2..4206cd6 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java @@ -35,7 +35,8 @@ import javax.xml.bind.annotation.XmlRootElement; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.Room.RoomElement; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java index 065f75a..c1a0888 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomOptionsDTO.java @@ -26,7 +26,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.json.JSONObject; +import com.github.openjson.JSONObject; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java index ce5a6f6..b5e6b3d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/ExternalUserDTO.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.json.JSONObject; +import com.github.openjson.JSONObject; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java ---------------------------------------------------------------------- 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 858d751..8d43150 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 @@ -35,7 +35,8 @@ import org.apache.openmeetings.db.entity.user.Address; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; import org.apache.openmeetings.db.entity.user.User.Type; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; @XmlRootElement public class UserDTO implements Serializable { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java index 3455104..e39458d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DtoHelper.java @@ -21,8 +21,8 @@ package org.apache.openmeetings.db.util; import java.util.ArrayList; import java.util.Collection; -import org.json.JSONArray; -import org.json.JSONObject; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; public class DtoHelper { public static Integer optInt(JSONObject o, String key) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java index e24071c..7ddc63e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileItemTree.java @@ -36,7 +36,8 @@ import org.apache.wicket.markup.repeater.ReuseIfModelsEqualStrategy; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.string.Strings; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; public class FileItemTree extends DefaultNestedTree<FileItem> { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index 5fb868c..1cb375f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Optional; import java.util.UUID; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; @@ -312,9 +311,9 @@ public abstract class FileTreePanel extends Panel { void updateNode(AjaxRequestTarget target, FileItem fi) { if (fi != null && target != null) { if (Type.Folder == fi.getType()) { - tree.updateBranch(fi, Optional.of(target)); + tree.updateBranch(fi, target); } else { - tree.updateNode(fi, Optional.of(target)); + tree.updateNode(fi, target); } } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- 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 b3fa2e1..fbfb409 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 @@ -65,10 +65,11 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.flow.RedirectToUrlException; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.string.StringValue; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONObject; + public class SignInPage extends BaseInitedPage { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(SignInPage.class, webAppRootKey); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java index d7f4c94..57cc928 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java @@ -51,11 +51,12 @@ import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.time.Duration; -import org.json.JSONArray; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; + public class SwfPanel extends BasePanel { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, webAppRootKey); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java index 611031f..cb0e6a5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java @@ -58,10 +58,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.util.string.Strings; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONObject; import com.googlecode.wicket.jquery.ui.widget.tabs.TabbedPanel; import com.googlecode.wicket.kendo.ui.widget.tabs.TabListModel; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java index 40ea323..19a846b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java @@ -58,11 +58,11 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.time.Duration; -import org.json.JSONArray; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; import com.googlecode.wicket.jquery.core.Options; import com.googlecode.wicket.jquery.ui.calendar.Calendar; import com.googlecode.wicket.jquery.ui.calendar.CalendarView; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index 3cd5771..5285e7c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -66,10 +66,10 @@ import org.apache.wicket.markup.html.form.HiddenField; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import org.json.JSONObject; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import com.github.openjson.JSONObject; import com.googlecode.wicket.jquery.ui.form.button.AjaxButton; import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java ---------------------------------------------------------------------- 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 37e9e5f..1e339ae 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 @@ -24,7 +24,8 @@ import static org.apache.openmeetings.web.app.Application.SIGNIN_MAPPING; import org.apache.wicket.protocol.http.ClientProperties; import org.apache.wicket.request.IRequestParameters; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; public class ExtendedClientProperties extends ClientProperties { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index 0c06248..7d75276 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -33,11 +33,12 @@ import org.apache.openmeetings.db.util.FormatHelper; import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; import org.apache.wicket.util.string.Strings; import org.apache.wicket.validation.Validatable; -import org.json.JSONException; -import org.json.JSONStringer; import org.wicketstuff.select2.ChoiceProvider; import org.wicketstuff.select2.Response; +import com.github.openjson.JSONException; +import com.github.openjson.JSONStringer; + public class UserChoiceProvider extends ChoiceProvider<User> { private static final long serialVersionUID = 1L; private final static int PAGE_SIZE = 10; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/main/webapp/css/room.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css index fb9d793..a4fae3c 100644 --- a/openmeetings-web/src/main/webapp/css/room.css +++ b/openmeetings-web/src/main/webapp/css/room.css @@ -468,3 +468,4 @@ height: 20px; padding: 0; } + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java index ffd1e79..54170fb 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestCalendarService.java @@ -46,11 +46,12 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.webservice.util.AppointmentParamConverter; -import org.json.JSONArray; -import org.json.JSONObject; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; + public class TestCalendarService extends AbstractWebServiceTest { public final static String CALENDAR_SERVICE_URL = BASE_SERVICES_URL + "/calendar"; @Autowired http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java index e68b2ec..31edf2e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestWebConverters.java @@ -29,9 +29,10 @@ import java.util.Date; import org.apache.openmeetings.db.dto.user.UserDTO; import org.apache.openmeetings.webservice.util.CalendarParamConverter; import org.apache.openmeetings.webservice.util.DateParamConverter; -import org.json.JSONObject; import org.junit.Test; +import com.github.openjson.JSONObject; + public class TestWebConverters { @Test public void testDateConverter() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentListMessageBodyWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentListMessageBodyWriter.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentListMessageBodyWriter.java index f8fafe2..4dd6cc8 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentListMessageBodyWriter.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentListMessageBodyWriter.java @@ -37,8 +37,9 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import org.apache.openmeetings.db.dto.calendar.AppointmentDTO; -import org.json.JSONArray; -import org.json.JSONObject; + +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; @Provider @Produces({MediaType.APPLICATION_JSON}) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyWriter.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyWriter.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyWriter.java index 7a8d84c..d46e29a 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyWriter.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyWriter.java @@ -35,7 +35,8 @@ import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import org.apache.openmeetings.db.dto.calendar.AppointmentDTO; -import org.json.JSONObject; + +import com.github.openjson.JSONObject; @Provider @Produces({MediaType.APPLICATION_JSON}) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentParamConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentParamConverter.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentParamConverter.java index b0793a0..f322801 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentParamConverter.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentParamConverter.java @@ -31,8 +31,9 @@ import org.apache.openmeetings.db.dto.calendar.MeetingMemberDTO; import org.apache.openmeetings.db.dto.room.RoomDTO; import org.apache.openmeetings.db.dto.user.UserDTO; import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder; -import org.json.JSONArray; -import org.json.JSONObject; + +import com.github.openjson.JSONArray; +import com.github.openjson.JSONObject; public class AppointmentParamConverter implements ParamConverter<AppointmentDTO> { public static final String ROOT = "appointmentDTO"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e6940fa5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5bc839f..3ee28d7 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ <maven.javadoc.version>2.10.3</maven.javadoc.version> <maven.surefire.version>2.19.1</maven.surefire.version> <maven-site.version>3.3</maven-site.version> - <wicket.version>8.0.0-M4</wicket.version> + <wicket.version>8.0.0-M5</wicket.version> <wicketju.version>8.0.0-M4.1</wicketju.version> - <wickets.version>8.0.0-M4</wickets.version> + <wickets.version>8.0.0-M5</wickets.version> <red5-server.version>1.0.9-M6</red5-server.version> <red5-client.version>1.0.9-M6</red5-client.version> <spring.version>4.3.6.RELEASE</spring.version>
