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 2017/05/01 06:11:06 UTC
[15/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1467]
wicketstuff, wicket-jquery-ui and openjpa are updated, hacks removed
[OPENMEETINGS-1467] wicketstuff, wicket-jquery-ui and openjpa are updated, hacks removed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5bb670d8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5bb670d8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5bb670d8
Branch: refs/heads/3.1.x
Commit: 5bb670d87755560e105b83a04a2932e0235b4525
Parents: c8c94d2
Author: Maxim Solodovnik <so...@apache.org>
Authored: Sun Jan 8 05:30:46 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Sun Jan 8 05:30:46 2017 +0000
----------------------------------------------------------------------
openmeetings-db/pom.xml | 2 +-
.../web/common/GeneralUserForm.java | 3 +-
.../web/common/KendoCultureHeaderItem.java | 50 --------------------
.../web/common/OmDateTimePicker.java | 3 +-
pom.xml | 4 +-
5 files changed, 7 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5bb670d8/openmeetings-db/pom.xml
----------------------------------------------------------------------
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index 9c96b72..38abf36 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -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 -->
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5bb670d8/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index da5ad39..b336c0b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -64,6 +64,7 @@ import org.wicketstuff.select2.ChoiceProvider;
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 Form<User> {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.get());
+ response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5bb670d8/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
deleted file mode 100644
index 1a17723..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.common;
-
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-
-import org.apache.openmeetings.web.app.WebSession;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-
-import com.googlecode.wicket.kendo.ui.KendoCulture;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
-
-public class KendoCultureHeaderItem {
- private static Set<String> CULTURES = new HashSet<>();
-
- public static JavaScriptHeaderItem get() {
- if (CULTURES.isEmpty()) {
- for (KendoCulture c : KendoCulture.values()) {
- CULTURES.add(c.toString());
- }
- }
- Locale l = WebSession.get().getLocale();
- String culture = l.toLanguageTag();
- if (!CULTURES.contains(culture)) {
- culture = l.getLanguage();
- if (!CULTURES.contains(culture)) {
- culture = Locale.ENGLISH.getLanguage();
- }
- }
- return JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(culture));
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5bb670d8/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
index 6fd0ede..042f04f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
@@ -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 DateTimePicker {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(KendoCultureHeaderItem.get());
+ response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale()));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5bb670d8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44bb5c2..23bc182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>