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 2016/05/13 12:39:30 UTC
svn commit: r1743670 - in
/openmeetings/application/branches/3.1.x/openmeetings-web: ./
src/main/java/org/apache/openmeetings/web/app/
src/main/java/org/apache/openmeetings/web/user/dashboard/
src/main/java/org/apache/openmeetings/web/user/dashboard/ad...
Author: solomax
Date: Fri May 13 12:39:30 2016
New Revision: 1743670
URL: http://svn.apache.org/viewvc?rev=1743670&view=rev
Log:
[OPENMEETINGS-1360] dashboard version is changed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/pom.xml Fri May 13 12:39:30 2016
@@ -30,7 +30,6 @@
<name>Openmeetings Web</name>
<description>TODO</description>
<properties>
- <wicket-dashboard.version>0.13.0+wicket-7</wicket-dashboard.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<mysql.version>5.1.38</mysql.version>
<old-backups.dir>${project.basedir}/test-data</old-backups.dir>
@@ -560,9 +559,9 @@
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
- <groupId>ro.fortsoft.wicket.dashboard</groupId>
- <artifactId>wicket-dashboard-core</artifactId>
- <version>${wicket-dashboard.version}</version>
+ <groupId>org.wicketstuff</groupId>
+ <artifactId>wicketstuff-dashboard-core</artifactId>
+ <version>${wickets.version}</version>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Fri May 13 12:39:30 2016
@@ -92,11 +92,10 @@ import org.apache.wicket.request.mapper.
import org.apache.wicket.util.collections.ConcurrentHashSet;
import org.slf4j.Logger;
import org.springframework.web.context.WebApplicationContext;
-
-import ro.fortsoft.wicket.dashboard.WidgetRegistry;
-import ro.fortsoft.wicket.dashboard.web.DashboardContext;
-import ro.fortsoft.wicket.dashboard.web.DashboardContextInjector;
-import ro.fortsoft.wicket.dashboard.web.DashboardSettings;
+import org.wicketstuff.dashboard.WidgetRegistry;
+import org.wicketstuff.dashboard.web.DashboardContext;
+import org.wicketstuff.dashboard.web.DashboardContextInjector;
+import org.wicketstuff.dashboard.web.DashboardSettings;
public class Application extends AuthenticatedWebApplication implements IApplication {
private static final Logger log = getLogger(Application.class, webAppRootKey);
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Fri May 13 12:39:30 2016
@@ -81,11 +81,10 @@ import org.apache.wicket.request.cycle.R
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
-
-import ro.fortsoft.wicket.dashboard.Dashboard;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetFactory;
-import ro.fortsoft.wicket.dashboard.web.DashboardContext;
+import org.wicketstuff.dashboard.Dashboard;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetFactory;
+import org.wicketstuff.dashboard.web.DashboardContext;
public class WebSession extends AbstractAuthenticatedWebSession implements IWebSession {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java Fri May 13 12:39:30 2016
@@ -20,11 +20,10 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.AbstractWidget;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetLocation;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
public class MyRoomsWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetDescriptor.java Fri May 13 12:39:30 2016
@@ -19,8 +19,7 @@
package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
-
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.WidgetDescriptor;
public class MyRoomsWidgetDescriptor implements WidgetDescriptor {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidgetView.java Fri May 13 12:39:30 2016
@@ -22,9 +22,8 @@ import static org.apache.openmeetings.we
import org.apache.openmeetings.web.user.rooms.RoomsPanel;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
public class MyRoomsWidgetView extends WidgetView {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java Fri May 13 12:39:30 2016
@@ -22,9 +22,8 @@ import org.apache.openmeetings.db.util.F
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.Dashboard;
-import ro.fortsoft.wicket.dashboard.web.DashboardPanel;
+import org.wicketstuff.dashboard.Dashboard;
+import org.wicketstuff.dashboard.web.DashboardPanel;
public class OmDashboardPanel extends UserPanel {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java Fri May 13 12:39:30 2016
@@ -20,11 +20,10 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.AbstractWidget;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetLocation;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
public class RssWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetDescriptor.java Fri May 13 12:39:30 2016
@@ -19,8 +19,7 @@
package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
-
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.WidgetDescriptor;
public class RssWidgetDescriptor implements WidgetDescriptor {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidgetView.java Fri May 13 12:39:30 2016
@@ -36,9 +36,8 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.resource.ContentDisposition;
import org.apache.wicket.util.resource.AbstractResourceStream;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
-
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
public class RssWidgetView extends WidgetView {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java Fri May 13 12:39:30 2016
@@ -20,11 +20,10 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.AbstractWidget;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetLocation;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
public class StartWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetDescriptor.java Fri May 13 12:39:30 2016
@@ -19,8 +19,7 @@
package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
-
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.WidgetDescriptor;
public class StartWidgetDescriptor implements WidgetDescriptor {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java Fri May 13 12:39:30 2016
@@ -28,9 +28,8 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
import com.googlecode.wicket.jquery.ui.form.button.Button;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java Fri May 13 12:39:30 2016
@@ -20,11 +20,10 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.AbstractWidget;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetLocation;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
public class WelcomeWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetDescriptor.java Fri May 13 12:39:30 2016
@@ -19,8 +19,7 @@
package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
-
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.WidgetDescriptor;
public class WelcomeWidgetDescriptor implements WidgetDescriptor {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java Fri May 13 12:39:30 2016
@@ -37,9 +37,8 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
public class WelcomeWidgetView extends WidgetView {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java Fri May 13 12:39:30 2016
@@ -20,11 +20,10 @@ package org.apache.openmeetings.web.user
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.AbstractWidget;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetLocation;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
+import org.wicketstuff.dashboard.AbstractWidget;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetLocation;
+import org.wicketstuff.dashboard.web.WidgetView;
public class AdminWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetDescriptor.java Fri May 13 12:39:30 2016
@@ -19,8 +19,7 @@
package org.apache.openmeetings.web.user.dashboard.admin;
import org.apache.openmeetings.web.app.Application;
-
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.WidgetDescriptor;
public class AdminWidgetDescriptor implements WidgetDescriptor {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java Fri May 13 12:39:30 2016
@@ -21,12 +21,11 @@ package org.apache.openmeetings.web.user
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.web.WidgetView;
import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.web.WidgetView;
-
public class AdminWidgetView extends WidgetView {
private static final long serialVersionUID = 1L;
private final AdminCleanupInfoDialog cleanupDialog;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.java Fri May 13 12:39:30 2016
@@ -37,11 +37,10 @@ import org.apache.wicket.markup.html.lis
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-
-import ro.fortsoft.wicket.dashboard.Dashboard;
-import ro.fortsoft.wicket.dashboard.Widget;
-import ro.fortsoft.wicket.dashboard.WidgetDescriptor;
-import ro.fortsoft.wicket.dashboard.web.DashboardContext;
+import org.wicketstuff.dashboard.Dashboard;
+import org.wicketstuff.dashboard.Widget;
+import org.wicketstuff.dashboard.WidgetDescriptor;
+import org.wicketstuff.dashboard.web.DashboardContext;
public class WidgetsPanel extends Panel {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboard.java Fri May 13 12:39:30 2016
@@ -22,8 +22,8 @@ import static org.apache.openmeetings.we
import static org.apache.openmeetings.web.user.dashboard.RssWidget.WIDGET_ID_RSS;
import static org.apache.openmeetings.web.user.dashboard.admin.AdminWidget.WIDGET_ID_ADMIN;
-import ro.fortsoft.wicket.dashboard.DefaultDashboard;
-import ro.fortsoft.wicket.dashboard.Widget;
+import org.wicketstuff.dashboard.DefaultDashboard;
+import org.wicketstuff.dashboard.Widget;
public class UserDashboard extends DefaultDashboard {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java?rev=1743670&r1=1743669&r2=1743670&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java Fri May 13 12:39:30 2016
@@ -30,10 +30,9 @@ import java.nio.charset.StandardCharsets
import java.util.Collections;
import org.slf4j.Logger;
-
-import ro.fortsoft.wicket.dashboard.Dashboard;
-import ro.fortsoft.wicket.dashboard.DashboardPersister;
-import ro.fortsoft.wicket.dashboard.WidgetComparator;
+import org.wicketstuff.dashboard.Dashboard;
+import org.wicketstuff.dashboard.DashboardPersister;
+import org.wicketstuff.dashboard.WidgetComparator;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;