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/10/09 05:59:00 UTC
svn commit: r1707657 [1/2] - in /openmeetings/branches/3.0.x: ./
src/main/webapp/WEB-INF/
src/web/java/org/apache/openmeetings/web/admin/backup/
src/web/java/org/apache/openmeetings/web/admin/configurations/
src/web/java/org/apache/openmeetings/web/adm...
Author: solomax
Date: Fri Oct 9 03:58:59 2015
New Revision: 1707657
URL: http://svn.apache.org/viewvc?rev=1707657&view=rev
Log:
[OPENMEETINGS-1259] wicket and wicket-jquery versions are updated
Modified:
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/ivysettings.xml
openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/web.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/BasePanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/LanguageDropDown.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmLabel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessageDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserInfoDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingErrorsDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomEnterBehavior.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
Modified: openmeetings/branches/3.0.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Fri Oct 9 03:58:59 2015
@@ -397,27 +397,27 @@ webapps/openmeetings/WEB-INF/lib/stax-ap
webapps/openmeetings/WEB-INF/lib/stax2-api-jar-3.1.1.jar
webapps/openmeetings/WEB-INF/lib/velocity-jar-1.7.jar
webapps/openmeetings/WEB-INF/lib/velocity-tools-jar-2.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-core-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.12.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-bundle-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-culture-bundle-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-theme-default-bundle-6.20.1.jar
-webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-native-websocket-javax-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-request-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-6.20.0.jar
-webapps/openmeetings/WEB-INF/lib/wicket-util-jar-6.20.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-auth-roles-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-core-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-dashboard-core-jar-0.12.1+wicket-7.jar
+webapps/openmeetings/WEB-INF/lib/wicket-datetime-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-devutils-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-extensions-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-ioc-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-calendar-jar-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-core-jar-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-jar-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-jquery-ui-plugins-jar-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-bundle-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-culture-bundle-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-kendo-ui-theme-default-bundle-7.0.2.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-javax-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-request-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicket-util-jar-7.0.0.jar
webapps/openmeetings/WEB-INF/lib/woden-core-bundle-1.0-SNAPSHOT.jar
webapps/openmeetings/WEB-INF/lib/woodstox-core-asl-jar-4.1.4.jar
webapps/openmeetings/WEB-INF/lib/ws-commons-util-jar-1.0.2.jar
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Fri Oct 9 03:58:59 2015
@@ -227,66 +227,66 @@
<dependency org="org.simpleframework" name="simple-xml" rev="2.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-request" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-datetime" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-datetime" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="joda-time" name="joda-time" rev="2.3" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-native-websocket-javax" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-native-websocket-javax" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="br.com.digilabs.jqplot" name="jqplot4java" rev="1.3.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="jqplot" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="jqplot" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.20.2-20151005.220623-6" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.20.2-20151005.221005-6" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.20.1" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.20.1" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="6.20.1" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="6.20.1" conf="openmeetings->*" transitive="false"/>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-culture" rev="6.20.1" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-theme-default" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-kendo-ui-culture" rev="7.0.2" conf="openmeetings->*" transitive="false"/>
<dependency org="org.threeten" name="threetenbp" rev="1.2" conf="openmeetings->*" transitive="false"/>
- <dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.12.0" conf="openmeetings->*" transitive="false">
+ <dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.12.1+wicket-7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="com.google.code.gson" name="gson" rev="2.2.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="6.20.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
Modified: openmeetings/branches/3.0.x/ivysettings.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivysettings.xml?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivysettings.xml (original)
+++ openmeetings/branches/3.0.x/ivysettings.xml Fri Oct 9 03:58:59 2015
@@ -35,9 +35,9 @@
<url name="smslib" m2compatible="true">
<artifact pattern="http://smslib.org/maven2/v3/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]" />
</url>
- <url name="wicket-jquery-ui" m2compatible="true">
+ <!--url name="wicket-jquery-ui" m2compatible="true">
<artifact pattern="https://oss.sonatype.org/content/repositories/snapshots/[organisation]/[artifact]/6.20.2-SNAPSHOT/[artifact]-[revision].[ext]" />
- </url>
+ </url-->
</chain>
</resolvers>
<triggers>
Modified: openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/web.xml?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/web.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/WEB-INF/web.xml Fri Oct 9 03:58:59 2015
@@ -46,7 +46,7 @@
<filter>
<filter-name>OpenmeetingsApplication</filter-name>
- <filter-class>org.wicketstuff.protocol.ws.javax.JavaxWebSocketFilter</filter-class>
+ <filter-class>org.apache.wicket.protocol.ws.javax.JavaxWebSocketFilter</filter-class>
<init-param>
<param-name>applicationClassName</param-name>
<param-value>org.apache.openmeetings.web.app.Application</param-value>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Fri Oct 9 03:58:59 2015
@@ -171,7 +171,7 @@ public class BackupPanel extends AdminPa
download.initiate(target);
}
}).setVisible(false).setOutputMarkupPlaceholderTag(true));
- add(fileUploadField.add(new AjaxFormSubmitBehavior(this, "onchange") {
+ add(fileUploadField.add(new AjaxFormSubmitBehavior(this, "change") {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Fri Oct 9 03:58:59 2015
@@ -77,7 +77,7 @@ public class ConfigForm extends AdminBas
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Fri Oct 9 03:58:59 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,7 +46,7 @@ public class ConfigsPanel extends AdminP
private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("omConfigPanelInit();");
}
@@ -63,7 +64,7 @@ public class ConfigsPanel extends AdminP
item.add(new Label("configuration_id", c.getConfiguration_id()));
item.add(new Label("conf_key", c.getConf_key()));
item.add(new Label("conf_value", c.getConf_value()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Fri Oct 9 03:58:59 2015
@@ -43,6 +43,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -111,7 +112,7 @@ public class ConnectionsPanel extends Ad
target.add(container, details.setVisible(false));
}
}.setEnabled(!TRUE.equals(c.getIsScreenClient()) && !TRUE.equals(c.getIsAVClient())));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@Override
@@ -167,7 +168,7 @@ public class ConnectionsPanel extends Ad
target.add(containerWeb, details.setVisible(false));
}
}.setEnabled(!c.getSessionId().equals(WebSession.get().getId())));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@Override
@@ -211,7 +212,7 @@ public class ConnectionsPanel extends Ad
}
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Fri Oct 9 03:58:59 2015
@@ -98,7 +98,7 @@ public class GroupForm extends AdminBase
});
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
public void updateView(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Oct 9 03:58:59 2015
@@ -30,6 +30,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -46,7 +47,7 @@ public class GroupsPanel extends AdminPa
private GroupForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("groupsInit();");
}
@@ -68,7 +69,7 @@ public class GroupsPanel extends AdminPa
final Organisation o = item.getModelObject();
item.add(new Label("organisation_id", "" + o.getOrganisation_id()));
item.add(new Label("name", "" + o.getName()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangForm.java Fri Oct 9 03:58:59 2015
@@ -30,9 +30,9 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.time.Duration;
@@ -74,7 +74,7 @@ public class LangForm extends Form<Void>
languages = new DropDownChoice<Map.Entry<Long, Locale>>("language"
, new PropertyModel<Map.Entry<Long, Locale>>(langPanel, "language")
, getLanguages()
- , new IChoiceRenderer<Map.Entry<Long, Locale>>() {
+ , new ChoiceRenderer<Map.Entry<Long, Locale>>() {
private static final long serialVersionUID = 1L;
@Override
@@ -113,6 +113,6 @@ public class LangForm extends Form<Void>
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Fri Oct 9 03:58:59 2015
@@ -42,6 +42,7 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -77,7 +78,7 @@ public class LangPanel extends AdminPane
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("labelsInit();");
}
@@ -119,7 +120,7 @@ public class LangPanel extends AdminPane
final StringLabel fv = item.getModelObject();
item.add(new Label("name", fv.getKey()));
item.add(new Label("value", fv.getValue()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
@@ -153,7 +154,7 @@ public class LangPanel extends AdminPane
fileUploadField = new FileUploadField("fileInput");
langForm.add(fileUploadField);
langForm.add(new UploadProgressBar("progress", langForm, fileUploadField));
- fileUploadField.add(new AjaxFormSubmitBehavior(langForm, "onchange") {
+ fileUploadField.add(new AjaxFormSubmitBehavior(langForm, "change") {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Oct 9 03:58:59 2015
@@ -68,7 +68,7 @@ public class LdapForm extends AdminBaseF
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Oct 9 03:58:59 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,7 +46,7 @@ public class LdapsPanel extends AdminPan
private LdapForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("omLdapPanelInit();");
}
@@ -62,7 +63,7 @@ public class LdapsPanel extends AdminPan
item.add(new Label("ldapConfigId", "" + lc.getLdapConfigId()));
item.add(new Label("name", "" + lc.getName()));
item.add(new Label("configFileName", "" + lc.getConfigFileName()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java Fri Oct 9 03:58:59 2015
@@ -68,7 +68,7 @@ public class OAuthForm extends AdminBase
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Fri Oct 9 03:58:59 2015
@@ -50,7 +50,7 @@ public class OAuthPanel extends AdminPan
final OAuthServer server = item.getModelObject();
item.add(new Label("oauthServerId", String.valueOf(server.getId())));
item.add(new Label("name", server.getName()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Oct 9 03:58:59 2015
@@ -52,9 +52,9 @@ import org.apache.wicket.behavior.Attrib
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
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;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -93,7 +93,7 @@ public class RoomForm extends AdminBaseF
add(new DropDownChoice<Long>("numberOfPartizipants", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
- new IChoiceRenderer<Long>() {
+ new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
public Object getDisplayValue(Long id) {
return id;
@@ -290,7 +290,7 @@ public class RoomForm extends AdminBaseF
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
void updateClients(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Fri Oct 9 03:58:59 2015
@@ -31,6 +31,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -41,7 +42,7 @@ public class RoomsPanel extends AdminPan
private RoomForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("omRoomPanelInit();");
}
@@ -58,7 +59,7 @@ public class RoomsPanel extends AdminPan
item.add(new Label("rooms_id", "" + room.getRooms_id()));
item.add(new Label("name", "" + room.getName()));
item.add(new Label("ispublic", "" + room.getIspublic()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Fri Oct 9 03:58:59 2015
@@ -72,7 +72,7 @@ public class ServerForm extends AdminBas
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Fri Oct 9 03:58:59 2015
@@ -29,6 +29,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -45,7 +46,7 @@ public class ServersPanel extends AdminP
private ServerForm form;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("omServerPanelInit();");
}
@@ -62,7 +63,7 @@ public class ServersPanel extends AdminP
item.add(new Label("id", "" + server.getId()));
item.add(new Label("name", "" + server.getName()));
item.add(new Label("address", "" + server.getAddress()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.java Fri Oct 9 03:58:59 2015
@@ -53,9 +53,9 @@ import org.apache.wicket.ajax.form.OnCha
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
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;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
@@ -96,7 +96,7 @@ public class UserForm extends AdminBaseF
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
@Override
@@ -238,7 +238,7 @@ public class UserForm extends AdminBaseF
}
}
domainId.setChoices(ids);
- domainId.setChoiceRenderer(new IChoiceRenderer<Long>() {
+ domainId.setChoiceRenderer(new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
public Object getDisplayValue(Long object) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Fri Oct 9 03:58:59 2015
@@ -33,6 +33,7 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
@@ -48,12 +49,12 @@ public class UsersPanel extends AdminPan
private final MessageDialog warning = new MessageDialog("warning", Application.getString(797), Application.getString(343), DialogButtons.OK, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
}
};
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
super.onMenuPanelLoad(target);
target.appendJavaScript("omUserPanelInit();");
}
@@ -74,7 +75,7 @@ public class UsersPanel extends AdminPan
item.add(new Label("login", u.getLogin()));
item.add(new Label("firstName", u.getFirstname()));
item.add(new Label("lastName", u.getLastname()));
- item.add(new AjaxEventBehavior("onclick") {
+ item.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
protected void onEvent(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/AddFolderDialog.java Fri Oct 9 03:58:59 2015
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
@@ -73,7 +74,7 @@ public abstract class AddFolderDialog ex
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
+ protected void onOpen(IPartialPageRequestHandler target) {
super.onOpen(target);
setModelObject(name);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/BasePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/BasePanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/BasePanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/BasePanel.java Fri Oct 9 03:58:59 2015
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.comm
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.util.FormatHelper;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
@@ -52,7 +52,7 @@ public abstract class BasePanel extends
*
* @param target
*/
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
}
/**
@@ -60,6 +60,6 @@ public abstract class BasePanel extends
*
* @param target
*/
- public void cleanup(AjaxRequestTarget target) {
+ public void cleanup(IPartialPageRequestHandler target) {
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/GeneralUserForm.java Fri Oct 9 03:58:59 2015
@@ -43,6 +43,7 @@ import org.apache.openmeetings.web.app.A
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+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.head.JavaScriptHeaderItem;
@@ -50,7 +51,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
@@ -89,7 +89,7 @@ public class GeneralUserForm extends For
add(new DropDownChoice<Salutation>("salutation"
, new PropertyModel<Salutation>(this, "salutation")
, salutDao.getUserSalutations(getLanguage())
- , new IChoiceRenderer<Salutation>() {
+ , new ChoiceRenderer<Salutation>() {
private static final long serialVersionUID = 1L;
@Override
@@ -102,7 +102,7 @@ public class GeneralUserForm extends For
return "" + object.getSalutations_id();
}
})
- .add(new AjaxFormComponentUpdatingBehavior("onchange") {
+ .add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
@@ -126,7 +126,7 @@ public class GeneralUserForm extends For
private static final long serialVersionUID = 1L;
@Override
- public void onValueChanged(AjaxRequestTarget target) {
+ public void onValueChanged(IPartialPageRequestHandler target) {
User u = GeneralUserForm.this.getModelObject();
u.setAge(CalendarHelper.getDate(age, u.getTimeZoneId()));
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/LanguageDropDown.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/LanguageDropDown.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/LanguageDropDown.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/LanguageDropDown.java Fri Oct 9 03:58:59 2015
@@ -24,8 +24,8 @@ import java.util.Locale;
import java.util.Map;
import org.apache.openmeetings.db.dao.label.LabelDao;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.model.IModel;
public class LanguageDropDown extends DropDownChoice<Long> {
@@ -47,7 +47,7 @@ public class LanguageDropDown extends Dr
languages.add(e.getKey());
}
setChoices(languages);
- setChoiceRenderer(new IChoiceRenderer<Long>() {
+ setChoiceRenderer(new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmLabel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmLabel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmLabel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmLabel.java Fri Oct 9 03:58:59 2015
@@ -26,6 +26,6 @@ public class OmLabel extends Label {
public OmLabel(String id, String key, Object... parameters) {
super(id);
- setDefaultModel(new StringResourceModel(key, this, null, parameters));
+ setDefaultModel(new StringResourceModel(key, this).setParameters(parameters));
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java Fri Oct 9 03:58:59 2015
@@ -44,7 +44,7 @@ public abstract class PagingNavigatorPan
final Form<Void> f = new Form<Void>("pagingForm");
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
.add(new DropDownChoice<Integer>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
- .add(new AjaxFormComponentUpdatingBehavior("onchange") {
+ .add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java Fri Oct 9 03:58:59 2015
@@ -60,8 +60,8 @@ public class UploadableProfileImagePanel
}
}));
form.add(new UploadProgressBar("progress", form, fileUploadField));
- fileUploadField.add(new AjaxFormSubmitBehavior(form, "onchange") {
- private static final long serialVersionUID = 2160216679027859231L;
+ fileUploadField.add(new AjaxFormSubmitBehavior(form, "change") {
+ private static final long serialVersionUID = 1L;
@Override
protected void onSubmit(AjaxRequestTarget target) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/data/OmOrderByBorder.java Fri Oct 9 03:58:59 2015
@@ -21,14 +21,13 @@ package org.apache.openmeetings.web.data
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.repeater.data.sort.AjaxFallbackOrderByBorder;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.CssProvider;
public class OmOrderByBorder<T extends IDataProviderEntity> extends AjaxFallbackOrderByBorder<String> {
- private static final long serialVersionUID = -867341109912297431L;
+ private static final long serialVersionUID = 1L;
private DataViewContainer<T> container;
public OmOrderByBorder(final String id, final String property, DataViewContainer<T> container) {
- super(id, property, container.view.getDataProvider(), new SortIconCssProvider());
+ super(id, property, container.view.getDataProvider());
this.container = container;
setOutputMarkupId(true);
}
@@ -42,12 +41,4 @@ public class OmOrderByBorder<T extends I
target.add(container.container, container.navigator);
target.add(container.getLinks());
}
-
- static class SortIconCssProvider extends CssProvider<String> {
- private static final long serialVersionUID = 60178231250586887L;
-
- public SortIconCssProvider() {
- super("ui-icon ui-icon-carat-1-n sort-icon", "ui-icon ui-icon-carat-1-s sort-icon", "ui-icon ui-icon-carat-2-n-s sort-icon");
- }
- }
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/MainPage.java Fri Oct 9 03:58:59 2015
@@ -44,6 +44,7 @@ import org.apache.wicket.ajax.AjaxClient
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.devutils.debugbar.DebugBar;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
@@ -151,11 +152,11 @@ public class MainPage extends BaseInited
});
}
- public void updateContents(OmUrlFragment f, AjaxRequestTarget target) {
+ public void updateContents(OmUrlFragment f, IPartialPageRequestHandler target) {
updateContents(f, target, true);
}
- public void updateContents(OmUrlFragment f, AjaxRequestTarget target, boolean updateFragment) {
+ public void updateContents(OmUrlFragment f, IPartialPageRequestHandler target, boolean updateFragment) {
BasePanel panel = getPanel(f.getArea(), f.getType());
if (panel != null) {
Component prev = contents.get(CHILD_ID);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Fri Oct 9 03:58:59 2015
@@ -36,6 +36,7 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.Radio;
@@ -147,7 +148,7 @@ public class ForgetPasswordDialog extend
behavior.setOption("closeOnEscape", false);
}
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
s.open(target);
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.java Fri Oct 9 03:58:59 2015
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.page
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
@@ -62,7 +62,7 @@ public class KickMessageDialog extends A
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
WebSession.setKickedByAdmin(false);
Application.get().restartResponseAtSignInPage();
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Fri Oct 9 03:58:59 2015
@@ -44,6 +44,7 @@ import org.apache.openmeetings.web.app.W
import org.apache.openmeetings.web.common.LanguageDropDown;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -107,7 +108,7 @@ public class RegisterDialog extends Abst
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
s.open(target);
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Fri Oct 9 03:58:59 2015
@@ -31,6 +31,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
@@ -112,7 +113,7 @@ public class ResetPasswordDialog extends
behavior.setOption("closeOnEscape", false);
}
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
setResponsePage(Application.get().getSignInPageClass());
}
};
@@ -161,7 +162,7 @@ public class ResetPasswordDialog extends
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
if (resetBtn.equals(button)){
confirmReset.open(target);
} else {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Fri Oct 9 03:58:59 2015
@@ -47,6 +47,7 @@ import org.apache.wicket.ajax.AjaxEventB
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -121,7 +122,7 @@ public class SignInDialog extends Abstra
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
if (registerBtn.equals(button)) {
r.setClientTimeZone();
r.open(target);
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Fri Oct 9 03:58:59 2015
@@ -61,7 +61,6 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -195,7 +194,7 @@ public class InstallWizard extends Abstr
private final RequiredTextField<String> dbname = new RequiredTextField<String>("dbname", Model.of(""));
private final Form<ConnectionProperties> form = new Form<ConnectionProperties>("form", new CompoundPropertyModel<ConnectionProperties>(getProps(null))) {
private static final long serialVersionUID = 1L;
- private final DropDownChoice<DbType> db = new DropDownChoice<DbType>("dbType", Arrays.asList(DbType.values()), new IChoiceRenderer<DbType>() {
+ private final DropDownChoice<DbType> db = new DropDownChoice<DbType>("dbType", Arrays.asList(DbType.values()), new ChoiceRenderer<DbType>() {
private static final long serialVersionUID = 1L;
@Override
@@ -244,7 +243,7 @@ public class InstallWizard extends Abstr
try {
Class.forName(props.getDriver());
} catch (Exception e) {
- form.error(new StringResourceModel("install.wizard.db.step.nodriver", InstallWizard.this, null, null, getString("install.wizard.db.step.instructions." + props.getDbType().name())).getObject());
+ form.error(new StringResourceModel("install.wizard.db.step.nodriver", InstallWizard.this).setParameters(getString("install.wizard.db.step.instructions." + props.getDbType().name())).getObject());
return;
}
boolean valid = true;
@@ -290,8 +289,8 @@ public class InstallWizard extends Abstr
LocalEntityManagerFactoryBean emb = f.getBean(LocalEntityManagerFactoryBean.class);
emb.afterPropertiesSet();
} catch (Exception e) {
- form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this, null, null, e.getMessage()).getObject());
- log.error("error while patching", e);
+ form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this).setParameters(e.getMessage()).getObject());
+ log.error("error while patching", e);
}
}
};
@@ -681,7 +680,7 @@ public class InstallWizard extends Abstr
public TzDropDown(String id) {
super(id);
setChoices(AVAILABLE_TIMEZONES);
- setChoiceRenderer(new IChoiceRenderer<String>() {
+ setChoiceRenderer(new ChoiceRenderer<String>() {
private static final long serialVersionUID = 1L;
public Object getDisplayValue(String object) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java Fri Oct 9 03:58:59 2015
@@ -29,6 +29,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
+import java.util.Iterator;
import java.util.List;
import org.apache.openmeetings.data.conference.InvitationManager;
@@ -41,6 +42,7 @@ import org.apache.openmeetings.db.dao.us
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Invitation.Valid;
+import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.Organisation;
import org.apache.openmeetings.db.entity.user.Organisation_Users;
import org.apache.openmeetings.db.entity.user.User;
@@ -55,7 +57,6 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -71,7 +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.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;
@@ -102,8 +105,48 @@ public class InvitationDialog extends Ab
private final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<User>(new ArrayList<User>()));
private final Select2MultiChoice<Organisation> groups = new Select2MultiChoice<Organisation>("groups"
, new CollectionModel<Organisation>(new ArrayList<Organisation>())
- , new ArrayList<Organisation>()
- , new ChoiceRenderer<Organisation>("name", "organisation_id"));
+ , new TextChoiceProvider<Organisation>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void query(String term, int page, Response<Organisation> response) {
+ if (WebSession.getRights().contains(User.Right.Admin)) {
+ List<Organisation> groups = getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE);
+ for (Iterator<Organisation> i = groups.iterator(); i.hasNext();) {
+ Organisation g = i.next();
+ if (g.getName().toLowerCase().contains(term.toLowerCase())) {
+ response.add(g);
+ }
+ }
+ } else {
+ User u = getBean(UserDao.class).get(getUserId());
+ for (Organisation_Users ou : u.getOrganisation_users()) {
+ if (ou.getOrganisation().getName().toLowerCase().contains(term.toLowerCase())) {
+ response.add(ou.getOrganisation());
+ }
+ }
+ }
+ }
+
+ @Override
+ public Collection<Organisation> toChoices(Collection<String> ids) {
+ Collection<Organisation> c = new ArrayList<>();
+ for (String id : ids) {
+ c.add(getBean(OrganisationDao.class).get(Long.valueOf(id)));
+ }
+ return c;
+ }
+
+ @Override
+ protected String getDisplayText(Organisation choice) {
+ return choice.getName();
+ }
+
+ @Override
+ protected Object getId(Organisation choice) {
+ return choice.getOrganisation_id();
+ }
+ });
public InvitationDialog(String id, long roomId) {
super(id, Application.getString(214), new CompoundPropertyModel<Invitation>(new Invitation()));
@@ -120,7 +163,8 @@ public class InvitationDialog extends Ab
Invitation i = new Invitation();
User u = getBean(UserDao.class).get(getUserId());
i.setInvitedBy(u);
- i.setRoom(getBean(RoomDao.class).get(roomId));
+ Room r = getBean(RoomDao.class).get(roomId);
+ i.setRoom(r);
Calendar d = Calendar.getInstance();
i.setValidFrom(d.getTime());
d.add(Calendar.DATE, 1);
@@ -137,14 +181,6 @@ public class InvitationDialog extends Ab
message.setObject(null);
recipients.setModelObject(new ArrayList<User>());
recipients.setEnabled(true);
- if (WebSession.getRights().contains(User.Right.Admin)) {
- groups.setChoices(getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE));
- } else {
- groups.setChoices(new ArrayList<Organisation>());
- for (Organisation_Users ou : u.getOrganisation_users()) {
- groups.getChoices().add(ou.getOrganisation());
- }
- }
groups.setModelObject(new ArrayList<Organisation>());
groups.setEnabled(false);
tzId.setObject(u.getTimeZoneId());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Fri Oct 9 03:58:59 2015
@@ -33,9 +33,9 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.CompoundPropertyModel;
@@ -108,7 +108,7 @@ public class CreatePollDialog extends Ab
add(new RequiredTextField<String>("pollName").setLabel(Model.of(Application.getString(1410))));
add(new TextArea<String>("pollQuestion"));
add(new DropDownChoice<PollType>("pollType", getBean(PollDao.class).getPollTypes()
- , new IChoiceRenderer<PollType>() {
+ , new ChoiceRenderer<PollType>() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Fri Oct 9 03:58:59 2015
@@ -30,6 +30,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -87,7 +88,7 @@ public class PollResultsDialog extends A
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget handler, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
// TODO should rights be additionally checked here????
if(button != null && button.match(YES)) {
Long id = dispForm.getModelObject().getRoomPollId();
@@ -105,7 +106,7 @@ public class PollResultsDialog extends A
private static final long serialVersionUID = 1L;
@Override
- public void onClose(AjaxRequestTarget handler, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
// TODO should rights be additionally checked here????
if(button != null && button.match(YES)) {
getBean(PollDao.class).deletePoll(dispForm.getModelObject().getRoomPollId());
@@ -191,7 +192,7 @@ public class PollResultsDialog extends A
}
@Override
- public void onClose(AjaxRequestTarget handler, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
}
private String[] getTicks(RoomPoll p) {
@@ -301,7 +302,7 @@ public class PollResultsDialog extends A
updateModel(null);
}
- public void updateModel(AjaxRequestTarget handler) {
+ public void updateModel(IPartialPageRequestHandler handler) {
List<RoomPoll> list = new ArrayList<RoomPoll>();
RoomPoll p = getBean(PollDao.class).getPoll(roomId);
if (p != null) {
@@ -341,7 +342,7 @@ public class PollResultsDialog extends A
add(chartDiv.setOutputMarkupId(true));
}
- public void updateModel(RoomPoll poll, boolean redraw, AjaxRequestTarget handler) {
+ public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) {
setModelObject(poll);
name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreatedBy()));
count.setObject(poll == null ? 0 : poll.getRoomPollAnswerList().size());
@@ -353,7 +354,7 @@ public class PollResultsDialog extends A
}
}
- private void redraw(AjaxRequestTarget handler) {
+ private void redraw(IPartialPageRequestHandler handler) {
RoomPoll poll = getModelObject();
Chart<?> chart = SIMPLE_CHART.equals(chartType.getModelObject()) ? barChart(poll) : pieChart(poll);
handler.appendJavaScript(getScript(chart));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/AboutDialog.java Fri Oct 9 03:58:59 2015
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.web.app.Application;
-import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
@@ -53,6 +53,6 @@ public class AboutDialog extends Abstrac
return new ArrayList<DialogButton>();
}
- public void onClose(AjaxRequestTarget arg0, DialogButton arg1) {
+ public void onClose(IPartialPageRequestHandler arg0, DialogButton arg1) {
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.java Fri Oct 9 03:58:59 2015
@@ -41,7 +41,7 @@ import org.apache.wicket.markup.head.OnD
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.ws.IWebSocketSettings;
+import org.apache.wicket.protocol.ws.WebSocketSettings;
import org.apache.wicket.protocol.ws.api.IWebSocketConnection;
import org.apache.wicket.protocol.ws.api.registry.IWebSocketConnectionRegistry;
import org.red5.logging.Red5LoggerFactory;
@@ -115,7 +115,7 @@ public class ChatPanel extends BasePanel
m.setSent(new Date());
m.setFromUser(getBean(UserDao.class).get(getUserId()));
dao.update(m);
- IWebSocketConnectionRegistry reg = IWebSocketSettings.Holder.get(getApplication()).getConnectionRegistry();
+ IWebSocketConnectionRegistry reg = WebSocketSettings.Holder.get(getApplication()).getConnectionRegistry();
for (IWebSocketConnection c : reg.getConnections(getApplication())) {
try {
c.sendMessage(getMessage(m).toString());
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Fri Oct 9 03:58:59 2015
@@ -55,11 +55,11 @@ import org.apache.openmeetings.web.util.
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -130,7 +130,7 @@ public class AppointmentDialog extends A
confirmDelete = new MessageDialog("confirmDelete", Application.getString(814), Application.getString(833), DialogButtons.OK_CANCEL, DialogIcon.WARN){
private static final long serialVersionUID = 1L;
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
if (button != null && button.match(AbstractDialog.OK)){
deleteAppointment(target);
}
@@ -139,7 +139,7 @@ public class AppointmentDialog extends A
add(confirmDelete);
}
- protected void deleteAppointment(AjaxRequestTarget target) {
+ protected void deleteAppointment(IPartialPageRequestHandler target) {
getBean(AppointmentDao.class).delete(getModelObject(), getUserId());
calendarPanel.refresh(target);
}
@@ -160,12 +160,12 @@ public class AppointmentDialog extends A
}
@Override
- protected void onOpen(AjaxRequestTarget target) {
+ protected void onOpen(IPartialPageRequestHandler target) {
target.add(this.form);
}
@Override
- public void onClose(AjaxRequestTarget target, DialogButton button) {
+ public void onClose(IPartialPageRequestHandler target, DialogButton button) {
if (delete.equals(button)) {
confirmDelete.open(target);
} else if (enterRoom.equals(button)) {
@@ -308,7 +308,7 @@ public class AppointmentDialog extends A
add(new DropDownChoice<AppointmentReminderTyps>(
"remind"
, remindTypes
- , new IChoiceRenderer<AppointmentReminderTyps>() {
+ , new ChoiceRenderer<AppointmentReminderTyps>() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1707657&r1=1707656&r2=1707657&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Fri Oct 9 03:58:59 2015
@@ -39,6 +39,7 @@ import org.apache.wicket.ajax.AbstractAj
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.Form;
@@ -71,11 +72,11 @@ public class CalendarPanel extends UserP
private Calendar calendar;
@Override
- public void onMenuPanelLoad(AjaxRequestTarget target) {
+ public void onMenuPanelLoad(IPartialPageRequestHandler target) {
}
@Override
- public void cleanup(AjaxRequestTarget target) {
+ public void cleanup(IPartialPageRequestHandler target) {
refreshTimer.stop(target);
}
@@ -87,7 +88,7 @@ public class CalendarPanel extends UserP
return getBean(AppointmentReminderTypDao.class);
}
- public void refresh(AjaxRequestTarget target) {
+ public void refresh(IPartialPageRequestHandler target) {
calendar.refresh(target);
}