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 2013/07/02 08:30:35 UTC
svn commit: r1498798 - in /openmeetings/trunk/singlewebapp: ./
src/org/apache/openmeetings/ src/org/apache/openmeetings/data/user/
src/org/apache/openmeetings/data/user/dao/
src/org/apache/openmeetings/servlet/outputhandler/
src/org/apache/openmeetings...
Author: solomax
Date: Tue Jul 2 06:30:34 2013
New Revision: 1498798
URL: http://svn.apache.org/r1498798
Log:
[OPENMEETINGS-688] libraries are bumped, hacks are removed
Removed:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/OmAjaxFormValidatingBehavior.java
Modified:
openmeetings/trunk/singlewebapp/build.properties
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/OpenmeetingsVariables.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/DaoHelper.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/ProfilePanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
Modified: openmeetings/trunk/singlewebapp/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.properties?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.properties (original)
+++ openmeetings/trunk/singlewebapp/build.properties Tue Jul 2 06:30:34 2013
@@ -13,8 +13,7 @@ project.version=3.0.0
project.status=SNAPSHOT
ivy.install.version=2.3.0
maven.version=3.0.4
-red5.server.revision=4646
-red5.client.revision=4646
+red5.server.revision=4666
red5.server.version=1.0.2-SNAPSHOT
laszlo.proxied=solo
wicket.mode=DEPLOYMENT
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Tue Jul 2 06:30:34 2013
@@ -186,9 +186,6 @@
<dependency org="org.apache.velocity" name="velocity-tools" rev="2.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="commons-lang" name="commons-lang" rev="2.6" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<!-- added to avoid downloading version 1.3 with Axis2 -->
<dependency org="commons-codec" name="commons-codec" rev="1.6" conf="openmeetings->*" transitive="false">
<include type="jar" />
@@ -223,31 +220,31 @@
<dependency org="javax.mail" name="mail" rev="1.4.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.simpleframework" name="simple-xml" rev="2.6.9" conf="openmeetings->*" transitive="false">
+ <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.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-request" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-util" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-util" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-core" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-core" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-auth-roles" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-ioc" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-extensions" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.apache.wicket" name="wicket-datetime" rev="6.8.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.8.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.apache.wicket" name="wicket-devutils" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="org.apache.wicket" name="wicket-native-websocket-core" rev="0.9" conf="openmeetings->*" transitive="false">
@@ -256,22 +253,22 @@
<dependency org="org.apache.wicket" name="wicket-native-websocket-tomcat" rev="0.9" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.8.1" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-core" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.8.1" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.8.1" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.8.1" conf="openmeetings->*" transitive="false">
+ <dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-plugins" rev="6.9.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.8" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="com.google.code.gson" name="gson" rev="2.2.3" conf="openmeetings->*" transitive="false">
+ <dependency org="com.google.code.gson" name="gson" rev="2.2.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<!-- TODO need to be uncommented to implement file drad-n-drop to whiteboard
@@ -303,8 +300,9 @@
</dependency>
<!-- include type="bundle" / FIXME unable to get openjpa without sources -->
- <dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.3" conf="openmeetings.ext->*" transitive="false"/>
+ <dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.4" conf="openmeetings.ext->*" transitive="false"/>
<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.2" conf="openmeetings.ext->*" transitive="false"/>
+ <dependency org="commons-lang" name="commons-lang" rev="2.4" conf="openmeetings.ext->*" transitive="false"/> <!-- required by PCEnchancer -->
<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
<exclude name='commons-io' />
@@ -327,10 +325,10 @@
<!-- END OF JUNIT -->
<!-- START OF RAT -->
- <dependency org="org.apache.rat" name="apache-rat-core" rev="0.8" conf="rat->*" transitive="false">
+ <dependency org="org.apache.rat" name="apache-rat-core" rev="0.9" conf="rat->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.8" conf="rat->*" transitive="false">
+ <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.9" conf="rat->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF RAT -->
@@ -385,16 +383,16 @@
</dependency>
<!-- Tomcat 7 -->
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-core" conf="tomcat7->*" rev="7.0.41" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-jasper" conf="tomcat7->*" rev="7.0.41" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-juli" conf="tomcat7->*" rev="7.0.41" transitive="false" >
<include type="jar" />
</dependency>
- <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.34" transitive="false" >
+ <dependency org="org.apache.tomcat.embed" name="tomcat-embed-logging-log4j" conf="tomcat7->*" rev="7.0.41" transitive="false" >
<include type="jar" />
</dependency>
<dependency org="tomcatplugin" name="tomcatplugin" rev="1.4" conf="tomcat7->*" transitive="false">
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/OpenmeetingsVariables.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/OpenmeetingsVariables.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/OpenmeetingsVariables.java Tue Jul 2 06:30:34 2013
@@ -19,6 +19,7 @@
package org.apache.openmeetings;
public class OpenmeetingsVariables {
+ public static final String WEB_DATE_PATTERN = "dd.MM.yyyy HH:mm:ss"; //FIXME need to be made locale based
public static String webAppRootKey = null;
public static String webAppRootPath = null;
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java Tue Jul 2 06:30:34 2013
@@ -41,7 +41,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/PrivateMessagesDao.java Tue Jul 2 06:30:34 2013
@@ -29,7 +29,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.Query;
import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.data.IDataProviderDao;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java Tue Jul 2 06:30:34 2013
@@ -29,7 +29,7 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openjpa.persistence.OpenJPAPersistence;
import org.apache.openjpa.persistence.OpenJPAQuery;
import org.apache.openmeetings.data.IDataProviderDao;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DownloadHandler.java Tue Jul 2 06:30:34 2013
@@ -31,7 +31,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.file.dao.FileExplorerItemDao;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Tue Jul 2 06:30:34 2013
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.FieldManager;
import org.apache.openmeetings.data.basic.SessiondataDao;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java Tue Jul 2 06:30:34 2013
@@ -31,7 +31,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.transaction.util.FileHelper;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.file.FileProcessor;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/DaoHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/DaoHelper.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/DaoHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/DaoHelper.java Tue Jul 2 06:30:34 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.utils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
public class DaoHelper {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java Tue Jul 2 06:30:34 2013
@@ -22,7 +22,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedHashMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Tue Jul 2 06:30:34 2013
@@ -18,14 +18,16 @@
*/
package org.apache.openmeetings.web.admin.configurations;
+import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
+
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -72,14 +74,13 @@ public class ConfigForm extends AdminBas
}
}));
add(new RequiredTextField<String>("conf_value").setLabel(Model.of(WebSession.getString(271))));
- add(DateLabel.forDatePattern("updatetime", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("updatetime", WEB_DATE_PATTERN));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
-
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java Tue Jul 2 06:30:34 2013
@@ -31,8 +31,8 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.web.admin.AdminCommonUserForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RequiredTextField;
@@ -56,7 +56,7 @@ public class GroupForm extends AdminComm
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java Tue Jul 2 06:30:34 2013
@@ -22,11 +22,11 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmCallListener;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -112,6 +112,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
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Tue Jul 2 06:30:34 2013
@@ -18,14 +18,16 @@
*/
package org.apache.openmeetings.web.admin.ldaps;
+import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
+
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -56,9 +58,9 @@ public class LdapForm extends AdminBaseF
add(new RequiredTextField<String>("name").setLabel(Model.of(WebSession.getString(1108))));
add(new CheckBox("isActive"));
- add(DateLabel.forDatePattern("inserted", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("inserted", WEB_DATE_PATTERN));
add(new Label("insertedby.login"));
- add(DateLabel.forDatePattern("updated", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("updatedby.login"));
add(new RequiredTextField<String>("configFileName").setLabel(Model.of(WebSession.getString(1115))));
add(new CheckBox("addDomainToUserName"));
@@ -67,7 +69,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
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java Tue Jul 2 06:30:34 2013
@@ -44,11 +44,11 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ConfirmCallListener;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -240,7 +240,7 @@ public class RoomForm extends AdminCommo
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
void updateModerators(AjaxRequestTarget target) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java Tue Jul 2 06:30:34 2013
@@ -18,14 +18,16 @@
*/
package org.apache.openmeetings.web.admin.servers;
+import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
+
import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -62,17 +64,17 @@ public class ServerForm extends AdminBas
add(new TextField<String>("pass"));
add(new TextField<String>("webapp"));
add(new TextField<String>("protocol"));
- add(DateLabel.forDatePattern("lastPing", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("lastPing", WEB_DATE_PATTERN));
//add(new Label("pingRunning"));
- add(DateLabel.forDatePattern("inserted", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("inserted", WEB_DATE_PATTERN));
add(new Label("insertedby.login"));
- add(DateLabel.forDatePattern("updated", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("updatedby.login"));
add(new TextArea<String>("comment"));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
@Override
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java Tue Jul 2 06:30:34 2013
@@ -18,9 +18,11 @@
*/
package org.apache.openmeetings.web.admin.users;
+import static org.apache.openmeetings.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.utils.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
import java.util.Arrays;
@@ -33,9 +35,8 @@ import org.apache.openmeetings.web.admin
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.GeneralUserForm;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.datetime.markup.html.basic.DateLabel;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -68,8 +69,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
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
-
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
@Override
@@ -137,8 +137,8 @@ public class UserForm extends AdminBaseF
add(generalForm = new GeneralUserForm("general", getModel(), true));
- add(DateLabel.forDatePattern("starttime", "dd.MM.yyyy HH:mm:ss"));
- add(DateLabel.forDatePattern("updatetime", "dd.MM.yyyy HH:mm:ss"));
+ add(forDatePattern("starttime", WEB_DATE_PATTERN));
+ add(forDatePattern("updatetime", WEB_DATE_PATTERN));
add(new CheckBox("forceTimeZoneCheck"));
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Tue Jul 2 06:30:34 2013
@@ -56,7 +56,8 @@ import org.apache.wicket.model.Model;
import ro.fortsoft.wicket.dashboard.web.util.ConfirmAjaxCallListener;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
-//TODO not released yet import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.plugins.fixedheadertable.FixedHeaderTableBehavior;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class MessagesContactsPanel extends UserPanel {
@@ -95,7 +96,7 @@ public class MessagesContactsPanel exten
selectedModel.setObject(id);
setDefaultFolderClass();
selectFolder(folder);
- //TODO not released yet container.add(new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100)));
+ container.add(new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100)));
if (target != null) {
target.add(folders, container);
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/ProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/ProfilePanel.java Tue Jul 2 06:30:34 2013
@@ -27,10 +27,10 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
-import org.apache.openmeetings.web.common.OmAjaxFormValidatingBehavior;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.util.time.Duration;
@@ -94,7 +94,7 @@ public class ProfilePanel extends UserPa
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
- OmAjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
}
};
add(form);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java?rev=1498798&r1=1498797&r2=1498798&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/UserAutoCompleteTextField.java Tue Jul 2 06:30:34 2013
@@ -96,7 +96,7 @@ public class UserAutoCompleteTextField e
public UserAutoCompleteTextField(String id) {
super(id, new UserTextRenderer());
- this.renderer = new UserTextRenderer(); //FIXME ugly
+ this.renderer = (UserTextRenderer)getRenderer();
}
@SuppressWarnings("unchecked")