Author: solomax
Date: Sun Jan 8 05:31:18 2017
New Revision: 1777866
URL: http://svn.apache.org/viewvc?rev=1777866&view=rev
Log:
[OPENMEETINGS-1373] wicketstuff, wicket-jquery-ui and openjpa are updated,
hacks removed
Removed:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/branches/3.2.x/pom.xml
Modified: openmeetings/application/branches/3.2.x/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/pom.xml?rev=1777866&r1=1777865&r2=1777866&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-db/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-db/pom.xml Sun Jan 8
05:31:18 2017
@@ -30,7 +30,7 @@
<name>Openmeetings DB</name>
<description>TODO</description>
<properties>
- <openjpa.version>2.4.1</openjpa.version>
+ <openjpa.version>2.4.2</openjpa.version>
<asterisk-java.version>1.0.0-final</asterisk-java.version>
<commons-dbcp.version>2.1.1</commons-dbcp.version>
<commons-pool.version>1.6</commons-pool.version> <!-- required
by OpenJPA for clustering -->
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1777866&r1=1777865&r2=1777866&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
Sun Jan 8 05:31:18 2017
@@ -64,6 +64,7 @@ import org.wicketstuff.select2.ChoicePro
import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
+import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem;
import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
public class GeneralUserForm extends Form<User> {
@@ -215,6 +216,6 @@ public class GeneralUserForm extends For
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.get());
+
response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1777866&r1=1777865&r2=1777866&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
Sun Jan 8 05:31:18 2017
@@ -28,6 +28,7 @@ import org.threeten.bp.LocalDateTime;
import org.threeten.bp.LocalTime;
import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
@@ -52,6 +53,6 @@ public class OmDateTimePicker extends Da
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.get());
+
response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1777866&r1=1777865&r2=1777866&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Sun Jan 8 05:31:18 2017
@@ -41,8 +41,8 @@
<maven.surefire.version>2.19.1</maven.surefire.version>
<maven-site.version>3.3</maven-site.version>
<wicket.version>7.6.0</wicket.version>
- <wicketju.version>7.5.0</wicketju.version>
- <wickets.version>7.5.0</wickets.version>
+ <wicketju.version>7.6.0</wicketju.version>
+ <wickets.version>7.6.0</wickets.version>
<wicketws.version>7.6.0</wicketws.version>
<red5-server.version>1.0.8-RELEASE</red5-server.version>
<red5-client.version>1.0.8-RELEASE</red5-client.version>
