[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16198208#comment-16198208 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit d1466705df13d0a57cfa8b8733d0d26bfb50a72c in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=d146670 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master 687415930 -> d1466705d [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d1466705 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d1466705 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d1466705 Branch: refs/heads/master Commit: d1466705df13d0a57cfa8b8733d0d26bfb50a72c Parents: 6874159 Author: Maxim SolodovnikAuthored: Tue Oct 10 12:54:41 2017 +0700 Committer: Maxim Solodovnik Committed: Tue Oct 10 12:54:41 2017 +0700 -- .../openmeetings/backup/converter/DateConverter.java | 4 +++- .../openmeetings/util/OpenmeetingsVariables.java | 2 ++ .../web/admin/configurations/ConfigsPanel.java | 4 +++- .../web/admin/connection/ConnectionsPanel.java | 3 ++- .../openmeetings/web/admin/email/EmailPanel.java | 4 +++- .../web/admin/groups/GroupUsersPanel.java| 3 ++- .../openmeetings/web/admin/groups/GroupsPanel.java | 4 +++- .../openmeetings/web/admin/labels/LangPanel.java | 3 ++- .../openmeetings/web/admin/ldaps/LdapsPanel.java | 4 +++- .../openmeetings/web/admin/oauth/OAuthPanel.java | 4 +++- .../openmeetings/web/admin/rooms/RoomForm.java | 3 ++- .../openmeetings/web/admin/rooms/RoomsPanel.java | 3 ++- .../openmeetings/web/admin/users/UsersPanel.java | 4 +++- .../apache/openmeetings/web/common/ImagePanel.java | 4 +++- .../openmeetings/web/common/menu/MenuPanel.java | 9 ++--- .../web/common/tree/ConvertingErrorsDialog.java | 3 ++- .../openmeetings/web/common/tree/FileTreePanel.java | 7 --- .../openmeetings/web/common/tree/FolderPanel.java| 6 -- .../org/apache/openmeetings/web/room/RoomPanel.java | 3 ++- .../web/room/activities/ActivitiesPanel.java | 11 ++- .../openmeetings/web/room/menu/RoomMenuPanel.java| 8 +--- .../web/room/menu/StartSharingButton.java| 3 ++- .../web/room/sidebar/RoomClientPanel.java| 8 +--- .../openmeetings/web/room/sidebar/RoomSidebar.java | 6 -- .../web/room/sidebar/icon/ClientIcon.java| 6 -- .../org/apache/openmeetings/web/room/wb/WbPanel.java | 3 ++- .../web/user/profile/MessagesContactsPanel.java | 15 --- .../web/user/profile/UserSearchPanel.java| 3 ++- .../openmeetings/web/user/rooms/RoomListPanel.java | 4 +++- 29 files changed, 95 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java -- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java index b24e0ce..a7d352b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/DateConverter.java @@ -18,6 +18,8 @@ */ package org.apache.openmeetings.backup.converter; +import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS; + import java.util.Date; import org.apache.openmeetings.util.CalendarPatterns; @@ -34,7 +36,7 @@ public class DateConverter implements Converter { @Override public void write(OutputNode node, Date value) throws Exception { - node.setAttribute("class", "java.util.Date"); + node.setAttribute(ATTR_CLASS, "java.util.Date"); node.setData(true); node.setValue(value == null ? "0" : CalendarPatterns.getExportDate(value)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d1466705/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java -- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 3c6c86b..a694819 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -21,6 +21,8 @@ package org.apache.openmeetings.util; import com.github.openjson.JSONObject; public class OpenmeetingsVariables { + public static final String ATTR_CLASS = "class"; + public static final String ATTR_TITLE =
[jira] [Commented] (OPENMEETINGS-1719) Multiple issues in Language editor
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1719?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16198173#comment-16198173 ] ASF subversion and git services commented on OPENMEETINGS-1719: --- Commit 687415930cc6c81dbda3deef848f19b67168f7c1 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=6874159 ] [OPENMEETINGS-1719] room seems to look as expected in RTL > Multiple issues in Language editor > -- > > Key: OPENMEETINGS-1719 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1719 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Admin, RTL >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.3.3, 4.0.0 > > > # Language file for hebrew is missing > # According to mailing list RTL labels are being saved reversed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1719] room seems to look as expected in RTL
Repository: openmeetings Updated Branches: refs/heads/master fba7dcdbf -> 687415930 [OPENMEETINGS-1719] room seems to look as expected in RTL Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/68741593 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/68741593 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/68741593 Branch: refs/heads/master Commit: 687415930cc6c81dbda3deef848f19b67168f7c1 Parents: fba7dcd Author: Maxim SolodovnikAuthored: Tue Oct 10 12:01:14 2017 +0700 Committer: Maxim Solodovnik Committed: Tue Oct 10 12:01:14 2017 +0700 -- .../apache/openmeetings/web/room/RoomPanel.html | 2 +- .../web/room/activities/ActivitiesPanel.html| 8 +-- .../web/room/activities/ActivitiesPanel.java| 36 ++ .../org/apache/openmeetings/web/room/room.js| 6 +- .../web/room/sidebar/RoomClientPanel.html | 2 +- .../web/room/sidebar/RoomClientPanel.java | 4 ++ .../openmeetings/web/room/wb/WbPanel.html | 8 +-- .../openmeetings/web/room/wb/tool-apointer.js | 2 +- .../apache/openmeetings/web/room/wb/wb-board.js | 19 ++--- .../apache/openmeetings/web/user/chat/Chat.html | 2 +- .../apache/openmeetings/web/user/chat/chat.js | 17 +++-- .../src/main/webapp/css/general-rtl.css | 33 + .../src/main/webapp/css/general.css | 2 +- openmeetings-web/src/main/webapp/css/room.css | 76 ++-- 14 files changed, 135 insertions(+), 82 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/68741593/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html index 2c1629b..48f13be 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html @@ -22,7 +22,7 @@ - + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/68741593/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html index b2b31fe..d9b2c29 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html @@ -25,10 +25,10 @@ - - - - + + + + http://git-wip-us.apache.org/repos/asf/openmeetings/blob/68741593/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index 1ff9fa3..57c6385 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -25,6 +25,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.Application.getOnlineClient; import static org.apache.openmeetings.web.app.WebSession.getUserId; +import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT; +import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT; import static org.apache.openmeetings.web.util.CallbackFunctionHelper.addOnClick; import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -41,6 +43,7 @@ import
openmeetings git commit: [OPENMEETINGS-1719] hebrew file is added
Repository: openmeetings Updated Branches: refs/heads/3.3.x 06858baf3 -> 458134073 [OPENMEETINGS-1719] hebrew file is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/45813407 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/45813407 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/45813407 Branch: refs/heads/3.3.x Commit: 458134073efb7376b8ac663364b964ed855a0e06 Parents: 06858ba Author: Maxim SolodovnikAuthored: Mon Oct 9 15:22:18 2017 +0700 Committer: Maxim Solodovnik Committed: Tue Oct 10 10:10:37 2017 +0700 -- .../web/app/Application_he.properties.xml | 985 +++ 1 file changed, 985 insertions(+) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/45813407/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml new file mode 100644 index 000..8d8a524 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml @@ -0,0 +1,985 @@ + +http://java.sun.com/dtd/properties.dtd;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't ask again + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[jira] [Commented] (OPENMEETINGS-1719) Multiple issues in Language editor
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1719?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16198080#comment-16198080 ] ASF subversion and git services commented on OPENMEETINGS-1719: --- Commit 458134073efb7376b8ac663364b964ed855a0e06 in openmeetings's branch refs/heads/3.3.x from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=4581340 ] [OPENMEETINGS-1719] hebrew file is added > Multiple issues in Language editor > -- > > Key: OPENMEETINGS-1719 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1719 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Admin, RTL >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.3.3, 4.0.0 > > > # Language file for hebrew is missing > # According to mailing list RTL labels are being saved reversed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1719) Multiple issues in Language editor
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1719?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16197177#comment-16197177 ] ASF subversion and git services commented on OPENMEETINGS-1719: --- Commit fba7dcdbfdf903f6a77654d9b63b1e21f2e7f1db in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=fba7dcd ] [OPENMEETINGS-1719] Room for RTL languages is partially fixed > Multiple issues in Language editor > -- > > Key: OPENMEETINGS-1719 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1719 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Admin, RTL >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.3.3, 4.0.0 > > > # Language file for hebrew is missing > # According to mailing list RTL labels are being saved reversed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1719] Room for RTL languages is partially fixed
Repository: openmeetings Updated Branches: refs/heads/master a06a73525 -> fba7dcdbf [OPENMEETINGS-1719] Room for RTL languages is partially fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/fba7dcdb Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/fba7dcdb Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/fba7dcdb Branch: refs/heads/master Commit: fba7dcdbfdf903f6a77654d9b63b1e21f2e7f1db Parents: a06a735 Author: Maxim SolodovnikAuthored: Mon Oct 9 22:47:53 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 22:47:53 2017 +0700 -- .../java/org/apache/openmeetings/web/common/main.js | 2 ++ .../openmeetings/web/pages/BaseInitedPage.java | 2 +- .../openmeetings/web/pages/BaseNotInitedPage.java| 2 +- .../org/apache/openmeetings/web/pages/BasePage.java | 4 +++- .../web/room/sidebar/icon/ClientIcon.java| 7 --- .../web/room/sidebar/icon/RefreshIcon.java | 6 +- .../org/apache/openmeetings/web/room/wb/wb-area.js | 2 +- openmeetings-web/src/main/webapp/css/general-rtl.css | 15 +++ 8 files changed, 32 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js index a04f3fe..add49b0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/main.js @@ -1,4 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ +var isRtl = "rtl" === $('html').attr('dir'); + Wicket.BrowserInfo.collectExtraInfo = function(info) { const l = window.location; info.codebase = l.origin + l.pathname; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java index fd4fe5e..1bd4a16 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseInitedPage.java @@ -38,7 +38,7 @@ public abstract class BaseInitedPage extends BasePage { } @Override - protected boolean isRtl() { + public boolean isRtl() { return FormatHelper.isRtlLanguage(getLanguageCode()); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java index 4b1dc21..cf8686a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java @@ -40,7 +40,7 @@ public abstract class BaseNotInitedPage extends BasePage { } @Override - protected boolean isRtl() { + public boolean isRtl() { boolean rtl = false; if (Application.isInstalled()) { rtl = FormatHelper.isRtlLanguage(WebSession.get().getLocale().toString()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/fba7dcdb/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index b5bd5ad..c56d50c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -47,6 +47,8 @@ import org.wicketstuff.urlfragment.AsyncUrlFragmentAwarePage; public abstract class BasePage extends AsyncUrlFragmentAwarePage { private static final long serialVersionUID = 1L; +
openmeetings git commit: [OPENMEETINGS-1714] more issues are fixed
Repository: openmeetings Updated Branches: refs/heads/master 328be41ff -> a06a73525 [OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a06a7352 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a06a7352 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a06a7352 Branch: refs/heads/master Commit: a06a7352536a2e1e2410f90b2c01cd899bf654e3 Parents: 328be41 Author: Maxim SolodovnikAuthored: Mon Oct 9 20:03:45 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 20:03:45 2017 +0700 -- .../db/entity/room/StreamClient.java| 4 +-- .../java/org/apache/openmeetings/cli/Admin.java | 9 +++--- .../screenshare/RTMPClientPublish.java | 8 - .../screenshare/gui/ScreenSharerFrame.java | 32 ++-- .../mail/template/RegisterUserTemplate.java | 12 .../service/room/InvitationManager.java | 8 ++--- .../openmeetings/service/user/UserManager.java | 6 ++-- .../openmeetings/util/OMContextListener.java| 5 --- .../web/common/OmDateTimePicker.java| 9 +- .../web/common/tree/FileTreePanel.java | 5 --- .../web/user/profile/UserSearchPanel.java | 2 +- 11 files changed, 37 insertions(+), 63 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java -- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java index 1e0058f..e93379b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java @@ -264,8 +264,8 @@ public class StreamClient implements IClient { return picture_uri; } - public void setPicture_uri(String picture_uri) { - this.picture_uri = picture_uri; + public void setPicture_uri(String pictureUri) { + this.picture_uri = pictureUri; } public String getLanguage() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java -- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 3073a29..96082c7 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -73,7 +73,6 @@ import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.Validatable; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.BeansException; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.web.context.WebApplicationContext; @@ -330,9 +329,9 @@ public class Admin { private void processBackup(String file) throws Exception { File f; if (!cmdl.hasOption("file")) { - file = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip"; - f = new File(home, file); - log("File name was not specified, '" + file + "' will be used"); + String fn = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip"; + f = new File(home, fn); + log("File name was not specified, '" + fn + "' will be used"); } else { f = new File(file); } @@ -357,7 +356,7 @@ public class Admin { log(report); } - private void processLdap() throws BeansException, OmException { + private void processLdap() throws OmException { if (!cmdl.hasOption("d")) { log("Please specify LDAP domain Id."); throw new ExitException(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java -- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196919#comment-16196919 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit a06a7352536a2e1e2410f90b2c01cd899bf654e3 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=a06a735 ] [OPENMEETINGS-1714] more issues are fixed > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196812#comment-16196812 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit 328be41ffdb5323d04237fedac43836ada5321d2 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=328be41 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master ce2f7a87a -> 328be41ff [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/328be41f Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/328be41f Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/328be41f Branch: refs/heads/master Commit: 328be41ffdb5323d04237fedac43836ada5321d2 Parents: ce2f7a8 Author: Maxim SolodovnikAuthored: Mon Oct 9 18:02:44 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 18:02:44 2017 +0700 -- .../core/converter/BaseConverter.java | 5 ++- .../core/converter/ImageConverter.java | 6 ++-- .../core/data/file/FileProcessor.java | 4 +-- .../openmeetings/core/remote/MobileService.java | 3 +- .../openmeetings/db/dao/label/LabelDao.java | 2 +- .../openmeetings/db/dao/room/RoomDao.java | 4 +-- .../db/dao/server/SessiondataDao.java | 2 +- .../openmeetings/db/dao/user/IUserManager.java | 2 +- .../openmeetings/db/dao/user/UserDao.java | 4 +-- .../openmeetings/db/dto/room/InvitationDTO.java | 1 - .../openmeetings/backup/BackupImport.java | 10 +++--- .../installation/ImportInitvalues.java | 15 .../screenshare/RTMPClientPublish.java | 4 +-- .../src/main/assembly/components/all.xml| 10 +++--- .../openmeetings/service/mail/EmailManager.java | 6 .../service/quartz/scheduler/CleanupJob.java| 4 +-- .../openmeetings/service/user/UserManager.java | 5 ++- .../apache/openmeetings/util/OmFileHelper.java | 4 +-- .../util/OpenmeetingsVariables.java | 1 - .../web/admin/connection/ConnectionsPanel.java | 4 +-- .../web/admin/labels/AddLanguageDialog.java | 6 ++-- .../openmeetings/web/admin/rooms/RoomForm.java | 1 - .../openmeetings/web/admin/users/UserForm.java | 2 +- .../openmeetings/web/app/Application.java | 38 ++-- .../apache/openmeetings/web/app/WebSession.java | 4 +-- .../web/common/OmDateTimePicker.java| 2 +- .../web/common/tree/FolderPanel.java| 4 +-- .../openmeetings/web/pages/NotInitedPage.html | 2 +- .../apache/openmeetings/web/room/RoomPanel.java | 2 +- .../web/room/menu/RoomMenuPanel.java| 2 +- .../web/room/sidebar/RoomClientPanel.java | 3 +- .../apache/openmeetings/web/room/wb/wb-board.js | 2 +- .../web/user/InviteUserToRoomDialog.java| 2 +- .../web/user/calendar/AppointmentDialog.java| 5 ++- .../web/user/calendar/CalendarPanel.java| 10 +++--- .../apache/openmeetings/web/user/chat/Chat.java | 2 +- .../web/user/dashboard/WelcomeWidgetView.java | 2 +- .../web/user/profile/MessagesContactsPanel.java | 2 +- .../web/user/profile/ProfileForm.java | 4 +-- .../web/user/profile/UserSearchPanel.html | 2 +- .../web/user/profile/UserSearchPanel.java | 4 +-- .../web/user/record/VideoPlayer.java| 2 +- .../apache/openmeetings/web/util/DateLabel.java | 5 +-- .../web/util/UserChoiceProvider.java| 2 +- .../src/main/webapp/css/general-rtl.css | 2 +- .../src/main/webapp/css/general.css | 2 +- .../TestDatabaseStructureMeetingMember.java | 11 +- .../webservice/CalendarWebService.java | 2 +- .../openmeetings/webservice/FileWebService.java | 4 +-- .../openmeetings/webservice/UserWebService.java | 2 -- 50 files changed, 101 insertions(+), 128 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/328be41f/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java -- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index 01539c5..fabf270 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -49,8 +49,8 @@ import org.apache.openmeetings.db.entity.record.RecordingMetaData; import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status; import org.apache.openmeetings.db.entity.record.RecordingMetaDelta; import org.apache.openmeetings.util.OmFileHelper; -import org.apache.openmeetings.util.process.ProcessResult; import org.apache.openmeetings.util.process.ProcessHelper; +import org.apache.openmeetings.util.process.ProcessResult; import org.red5.io.flv.impl.FLVWriter; import org.red5.logging.Red5LoggerFactory;
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196802#comment-16196802 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit ce2f7a87a47d264c46793c69273e4828b5ad3874 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=ce2f7a8 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master b2e50da13 -> ce2f7a87a [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ce2f7a87 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ce2f7a87 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ce2f7a87 Branch: refs/heads/master Commit: ce2f7a87a47d264c46793c69273e4828b5ad3874 Parents: b2e50da Author: Maxim SolodovnikAuthored: Mon Oct 9 17:33:14 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 17:33:14 2017 +0700 -- .../org/apache/openmeetings/core/converter/IRecordingConverter.java | 1 + .../main/java/org/apache/openmeetings/core/notifier/INotifier.java | 1 + .../main/java/org/apache/openmeetings/web/common/IUpdatable.java| 1 + 3 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce2f7a87/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java -- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java index 223a5f5..bf485c1 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/IRecordingConverter.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.core.converter; +@FunctionalInterface public interface IRecordingConverter { void startConversion(Long recordingId); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce2f7a87/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/INotifier.java -- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/INotifier.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/INotifier.java index 5a5682f..d751e5e 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/INotifier.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/INotifier.java @@ -22,6 +22,7 @@ import org.apache.openmeetings.db.entity.calendar.Appointment; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.user.User; +@FunctionalInterface public interface INotifier { void notify(User u, Appointment a, Invitation inv) throws Exception; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ce2f7a87/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java index 84b5a94..86b0529 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java @@ -22,6 +22,7 @@ import java.io.Serializable; import org.apache.wicket.ajax.AjaxRequestTarget; +@FunctionalInterface public interface IUpdatable extends Serializable { void update(AjaxRequestTarget target); }
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196794#comment-16196794 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit b2e50da132800c8393e2f664f836e7535dc6568e in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=b2e50da ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master e76158747 -> b2e50da13 [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/b2e50da1 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/b2e50da1 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/b2e50da1 Branch: refs/heads/master Commit: b2e50da132800c8393e2f664f836e7535dc6568e Parents: e761587 Author: Maxim SolodovnikAuthored: Mon Oct 9 17:19:04 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 17:19:04 2017 +0700 -- .../java/org/apache/openmeetings/cli/Admin.java | 220 ++- .../openmeetings/util/CalendarPatterns.java | 3 +- .../util/mail/ByteArrayDataSource.java | 1 + .../webservice/NetTestWebService.java | 4 +- 4 files changed, 120 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/b2e50da1/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java -- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 09d98e3..3073a29 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -66,12 +66,14 @@ import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.ConnectionProperties.DbType; import org.apache.openmeetings.util.ImportHelper; +import org.apache.openmeetings.util.OmException; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.mail.MailUtil; import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.Validatable; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; +import org.springframework.beans.BeansException; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.web.context.WebApplicationContext; @@ -235,119 +237,24 @@ public class Admin { String file = cmdl.getOptionValue("file", ""); switch(cmd) { case install: - { - step = "Install"; - if (cmdl.hasOption("file") && (cmdl.hasOption("user") || cmdl.hasOption("email") || cmdl.hasOption("group"))) { - log("Please specify even 'file' option or 'admin user'."); - throw new ExitException(); - } - boolean force = cmdl.hasOption("force"); - if (cmdl.hasOption("skip-default-objects")) { - cfg.setCreateDefaultObjects(false); - } - if (cmdl.hasOption("disable-frontend-register")) { - cfg.setAllowFrontendRegister(false); - } - if (cmdl.hasOption("system-email-address")) { - cfg.setMailReferer(cmdl.getOptionValue("system-email-address")); - } - if (cmdl.hasOption("smtp-server")) { - cfg.setSmtpServer(cmdl.getOptionValue("smtp-server")); - } - if (cmdl.hasOption("smtp-port")) { - cfg.setSmtpPort(Integer.valueOf(cmdl.getOptionValue("smtp-port"))); - } - if (cmdl.hasOption("email-auth-user")) { - cfg.setMailAuthName(cmdl.getOptionValue("email-auth-user")); - } - if (cmdl.hasOption("email-auth-pass")) { - cfg.setMailAuthPass(cmdl.getOptionValue("email-auth-pass")); - } - if (cmdl.hasOption("email-use-tls")) { - cfg.setMailUseTls(true); - } -
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196759#comment-16196759 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit e761587471f012ca0728561af9ff22ae53b09556 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=e761587 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master 5fca25f36 -> e76158747 [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e7615874 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e7615874 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e7615874 Branch: refs/heads/master Commit: e761587471f012ca0728561af9ff22ae53b09556 Parents: 5fca25f Author: Maxim SolodovnikAuthored: Mon Oct 9 16:47:32 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 16:47:32 2017 +0700 -- .../core/converter/BaseConverter.java | 8 +++ .../core/converter/InterviewConverter.java | 8 +++ .../core/converter/RecordingConverter.java | 4 ++-- .../listener/async/StreamAudioWriter.java | 6 +++--- .../openmeetings/core/ldap/LdapOptions.java | 22 ++-- .../openmeetings/core/remote/MobileService.java | 8 +++ .../core/remote/ScopeApplicationAdapter.java| 2 +- .../db/dao/server/SessiondataDao.java | 18 .../openmeetings/db/dao/user/IUserManager.java | 4 ++-- .../java/org/apache/openmeetings/cli/Admin.java | 8 +++ .../apache/openmeetings/screenshare/Core.java | 4 ++-- .../web/pages/auth/ForgetPasswordDialog.java| 4 ++-- .../web/room/poll/PollResultsDialog.java| 4 ++-- .../web/room/sidebar/RoomSidebar.java | 2 +- .../openmeetings/web/user/MessageDialog.java| 14 ++--- 15 files changed, 58 insertions(+), 58 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java -- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index 11a7e01..01539c5 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -305,18 +305,18 @@ public abstract class BaseConverter { metaDelta.setWaveOutPutName(hashFileGapsFullName); - String[] argv_sox = null; + String[] soxArgs = null; if (metaDelta.getDeltaTime() != null) { double gapSeconds = diffSeconds(metaDelta.getDeltaTime()); if (metaDelta.isStartPadding()) { - argv_sox = addSoxPad(returnLog, "fillGap", gapSeconds, 0, inputFile, outputGapFullWav); + soxArgs = addSoxPad(returnLog, "fillGap", gapSeconds, 0, inputFile, outputGapFullWav); } else if (metaDelta.isEndPadding()) { - argv_sox = addSoxPad(returnLog, "fillGap", 0, gapSeconds, inputFile, outputGapFullWav); + soxArgs = addSoxPad(returnLog, "fillGap", 0, gapSeconds, inputFile, outputGapFullWav); } } - if (argv_sox != null) { + if (soxArgs != null) { log.debug("START fillGap # Delta-ID :: " + metaDelta.getId()); metaDeltaDao.update(metaDelta); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e7615874/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java -- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java index c2f974c..5761869 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java @@ -134,14 +134,14 @@ public class InterviewConverter
openmeetings git commit: [OPENMEETINGS-980] wicket-datetime dependency is removed
Repository: openmeetings Updated Branches: refs/heads/master f2fb6c51b -> 5fca25f36 [OPENMEETINGS-980] wicket-datetime dependency is removed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5fca25f3 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5fca25f3 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5fca25f3 Branch: refs/heads/master Commit: 5fca25f36fde086a6c2ae318de0c842e0b50f99b Parents: f2fb6c5 Author: Maxim SolodovnikAuthored: Mon Oct 9 16:25:27 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 16:25:27 2017 +0700 -- openmeetings-web/pom.xml| 5 -- .../web/admin/configurations/ConfigForm.java| 5 +- .../openmeetings/web/admin/email/EmailForm.java | 14 ++ .../openmeetings/web/admin/ldaps/LdapForm.java | 7 ++- .../openmeetings/web/admin/users/UserForm.java | 7 ++- .../apache/openmeetings/web/util/DateLabel.java | 52 6 files changed, 63 insertions(+), 27 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/pom.xml -- diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml index 535a46b..f09b743 100644 --- a/openmeetings-web/pom.xml +++ b/openmeetings-web/pom.xml @@ -486,11 +486,6 @@ ${wicket.version} - org.apache.wicket - wicket-datetime - ${wicket.version} - - com.googlecode.wicket-jquery-ui wicket-jquery-ui-core ${wicketju.version} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java index 8ae972f..89731f4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java @@ -18,9 +18,7 @@ */ package org.apache.openmeetings.web.admin.configurations; -import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern; import java.util.Arrays; import java.util.List; @@ -31,6 +29,7 @@ import org.apache.openmeetings.db.entity.basic.Configuration.Type; 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.util.DateLabel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior; @@ -119,7 +118,7 @@ public class ConfigForm extends AdminBaseForm { } }; valueB = new CheckBox("valueB"); - add(forDatePattern("updated", WEB_DATE_PATTERN)); + add(new DateLabel("updated")); add(new Label("user.login")); add(new TextArea("comment")); update(null); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5fca25f3/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java index 3269cc5..a3b5e04 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java @@ -18,17 +18,13 @@ */ package org.apache.openmeetings.web.admin.email; -import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern; - -import java.util.Date; import org.apache.openmeetings.db.dao.basic.MailMessageDao; import
[jira] [Commented] (OPENMEETINGS-980) Library versions should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-980?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196736#comment-16196736 ] ASF subversion and git services commented on OPENMEETINGS-980: -- Commit 5fca25f36fde086a6c2ae318de0c842e0b50f99b in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=5fca25f ] [OPENMEETINGS-980] wicket-datetime dependency is removed > Library versions should be updated > -- > > Key: OPENMEETINGS-980 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-980 > Project: Openmeetings > Issue Type: Improvement > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Library versions should be keep up to date (continuous task) -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196636#comment-16196636 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit f2fb6c51bd7f5ec84f9136a4b4fb4c0cb49b9005 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=f2fb6c5 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1719) Multiple issues in Language editor
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1719?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196633#comment-16196633 ] ASF subversion and git services commented on OPENMEETINGS-1719: --- Commit 1de99d21379980600af06d5b86606b70df58b312 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=1de99d2 ] [OPENMEETINGS-1719] hebrew file is added > Multiple issues in Language editor > -- > > Key: OPENMEETINGS-1719 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1719 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Admin, RTL >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 3.3.3, 4.0.0 > > > # Language file for hebrew is missing > # According to mailing list RTL labels are being saved reversed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master 1de99d213 -> f2fb6c51b [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f2fb6c51 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f2fb6c51 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f2fb6c51 Branch: refs/heads/master Commit: f2fb6c51bd7f5ec84f9136a4b4fb4c0cb49b9005 Parents: 1de99d2 Author: Maxim SolodovnikAuthored: Mon Oct 9 15:22:55 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 15:22:55 2017 +0700 -- .../test/java/org/apache/openmeetings/db/dao/TestRoomDao.java | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f2fb6c51/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java -- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java index 717b687..4510492 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java @@ -20,7 +20,6 @@ package org.apache.openmeetings.db.dao; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.openmeetings.AbstractJUnitDefaults; @@ -40,7 +39,7 @@ public class TestRoomDao extends AbstractJUnitDefaults { protected RoomDao roomDao; @Test - public void testMicStatusHidden() { + public void testMicStatusHidden() throws Exception { Room r = roomDao.get(1); assertTrue("Default interview room should have mic status hidden", r.isHidden(RoomElement.MicrophoneStatus)); r = roomDao.get(5); @@ -48,8 +47,7 @@ public class TestRoomDao extends AbstractJUnitDefaults { r = roomDao.get(6); assertFalse("Default Mic room should have mic status visible", r.isHidden(RoomElement.MicrophoneStatus)); - User u = userDao.getByLogin(adminUsername, User.Type.user, null); - assertNotNull("Admin user should exist", u); + User u = createUser(); //creating new User here r = roomDao.getUserRoom(u.getId(), Room.Type.presentation, "bla"); boolean hidden = r.isHidden(RoomElement.MicrophoneStatus); if (!hidden && log.isDebugEnabled()) {
[jira] [Created] (OPENMEETINGS-1719) Multiple issues in Language editor
Maxim Solodovnik created OPENMEETINGS-1719: -- Summary: Multiple issues in Language editor Key: OPENMEETINGS-1719 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1719 Project: Openmeetings Issue Type: Bug Components: HTML5/Admin, RTL Affects Versions: 3.3.2 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Fix For: 3.3.3, 4.0.0 # Language file for hebrew is missing # According to mailing list RTL labels are being saved reversed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1719] hebrew file is added
Repository: openmeetings Updated Branches: refs/heads/master 5b45b33b9 -> 1de99d213 [OPENMEETINGS-1719] hebrew file is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/1de99d21 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/1de99d21 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/1de99d21 Branch: refs/heads/master Commit: 1de99d21379980600af06d5b86606b70df58b312 Parents: 5b45b33 Author: Maxim SolodovnikAuthored: Mon Oct 9 15:22:18 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 15:22:18 2017 +0700 -- .../web/app/Application_he.properties.xml | 985 +++ 1 file changed, 985 insertions(+) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/1de99d21/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml new file mode 100644 index 000..8d8a524 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml @@ -0,0 +1,985 @@ + +http://java.sun.com/dtd/properties.dtd;> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Don't ask again + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
[jira] [Commented] (OPENMEETINGS-1714) Issues reported by Sonar should be fixed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1714?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196584#comment-16196584 ] ASF subversion and git services commented on OPENMEETINGS-1714: --- Commit 5b45b33b9e7aa9a1b2a0003aa7c25af0977cd9bd in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=5b45b33 ] [OPENMEETINGS-1714] coverage is improved > Issues reported by Sonar should be fixed > > > Key: OPENMEETINGS-1714 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1714 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > > Issues reported by Sonar should be fixed -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1714] coverage is improved
Repository: openmeetings Updated Branches: refs/heads/master 10e64c047 -> 5b45b33b9 [OPENMEETINGS-1714] coverage is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5b45b33b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5b45b33b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5b45b33b Branch: refs/heads/master Commit: 5b45b33b9e7aa9a1b2a0003aa7c25af0977cd9bd Parents: 10e64c0 Author: Maxim SolodovnikAuthored: Mon Oct 9 14:24:41 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 14:24:41 2017 +0700 -- .../org/apache/openmeetings/db/dao/TestRoomDao.java| 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5b45b33b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java -- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java index 40b96cc..717b687 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java @@ -18,6 +18,7 @@ */ package org.apache.openmeetings.db.dao; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -27,11 +28,14 @@ import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.Room.RoomElement; import org.apache.openmeetings.db.entity.user.User; +import org.junit.Assert; import org.junit.Test; +import org.red5.logging.Red5LoggerFactory; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; - public class TestRoomDao extends AbstractJUnitDefaults { + private static final Logger log = Red5LoggerFactory.getLogger(TestRoomDao.class, getWebAppRootKey()); @Autowired protected RoomDao roomDao; @@ -47,6 +51,11 @@ public class TestRoomDao extends AbstractJUnitDefaults { User u = userDao.getByLogin(adminUsername, User.Type.user, null); assertNotNull("Admin user should exist", u); r = roomDao.getUserRoom(u.getId(), Room.Type.presentation, "bla"); - assertTrue("User presentation room should have mic status hidden", r.isHidden(RoomElement.MicrophoneStatus)); + boolean hidden = r.isHidden(RoomElement.MicrophoneStatus); + if (!hidden && log.isDebugEnabled()) { + log.debug("Invalid personal room found -> User: {}, Room: {} ... deleted ? {}", u, r, r.isDeleted()); + } + Assert.assertEquals("User presentation room should be created", Room.Type.presentation, r.getType()); + assertTrue("User presentation room should have mic status hidden", hidden); } }
[jira] [Resolved] (OPENMEETINGS-1717) OAuth2 login works weird in FF
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1717. Resolution: Fixed > OAuth2 login works weird in FF > -- > > Key: OPENMEETINGS-1717 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1717 > Project: Openmeetings > Issue Type: Bug > Components: OAuth >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 3.3.3, 4.0.0 > > > OAuth2 login works weird in FF: > it shown something very fast and display no auth screen > (tested with Google OAuth) > Works as expected in Chrome -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Commented] (OPENMEETINGS-1717) OAuth2 login works weird in FF
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196563#comment-16196563 ] ASF subversion and git services commented on OPENMEETINGS-1717: --- Commit 06858baf38df9d848a691e296d1ba7dc6d4377e3 in openmeetings's branch refs/heads/3.3.x from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=06858ba ] [OPENMEETINGS-1717] redirect seems to work as expected in FF > OAuth2 login works weird in FF > -- > > Key: OPENMEETINGS-1717 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1717 > Project: Openmeetings > Issue Type: Bug > Components: OAuth >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 3.3.3, 4.0.0 > > > OAuth2 login works weird in FF: > it shown something very fast and display no auth screen > (tested with Google OAuth) > Works as expected in Chrome -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1717] redirect seems to work as expected in FF
Repository: openmeetings Updated Branches: refs/heads/3.3.x 003d6b3b1 -> 06858baf3 [OPENMEETINGS-1717] redirect seems to work as expected in FF Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/06858baf Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/06858baf Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/06858baf Branch: refs/heads/3.3.x Commit: 06858baf38df9d848a691e296d1ba7dc6d4377e3 Parents: 003d6b3 Author: Maxim SolodovnikAuthored: Mon Oct 9 13:54:21 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 13:54:21 2017 +0700 -- .../web/pages/auth/SignInDialog.java| 35 +++ .../openmeetings/web/pages/auth/SignInPage.java | 99 +--- 2 files changed, 58 insertions(+), 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/06858baf/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java index 3ccc2f2..024e9ed 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.web.app.Application.getAuthenticationStrat import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin; import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister; +import static org.apache.openmeetings.web.pages.auth.SignInPage.showAuth; import static org.apache.openmeetings.web.room.SwfPanel.SWF; import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK; @@ -45,8 +46,8 @@ import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior; import org.apache.openmeetings.web.pages.HashPage; import org.apache.openmeetings.web.util.NonClosableDialog; import org.apache.wicket.AttributeModifier; +import org.apache.wicket.Component; import org.apache.wicket.RestartResponseException; -import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.form.AjaxButton; @@ -64,7 +65,6 @@ import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -274,31 +274,20 @@ public class SignInDialog extends NonClosableDialog { @Override protected void populateItem(final ListItem item) { - Button btn = new Button("oauthBtn"); - Image icon = new Image("icon", new Model()); - icon.setVisible(!Strings.isEmpty(item.getModelObject().getIconUrl())); - icon.add(new AttributeModifier("src", new IModel() { + final OAuthServer s = item.getModelObject(); + Button btn = new Button("oauthBtn") { private static final long serialVersionUID = 1L; @Override - public String getObject() { - return item.getModelObject().getIconUrl(); + public void onSubmit() { + showAuth(s, SignInDialog.this); } - - })); - btn.add(icon); - btn.add(new Label("label", item.getModelObject().getName())) - .add(new AjaxEventBehavior("click") { - private static
[jira] [Updated] (OPENMEETINGS-1717) OAuth2 login works weird in FF
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1717: --- Fix Version/s: 3.3.3 > OAuth2 login works weird in FF > -- > > Key: OPENMEETINGS-1717 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1717 > Project: Openmeetings > Issue Type: Bug > Components: OAuth >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 3.3.3, 4.0.0 > > > OAuth2 login works weird in FF: > it shown something very fast and display no auth screen > (tested with Google OAuth) > Works as expected in Chrome -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Updated] (OPENMEETINGS-1717) OAuth2 login works weird in FF
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1717?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-1717: --- Priority: Critical (was: Major) > OAuth2 login works weird in FF > -- > > Key: OPENMEETINGS-1717 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1717 > Project: Openmeetings > Issue Type: Bug > Components: OAuth >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 3.3.3, 4.0.0 > > > OAuth2 login works weird in FF: > it shown something very fast and display no auth screen > (tested with Google OAuth) > Works as expected in Chrome -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1717] redirect seems to work as expected in FF
Repository: openmeetings Updated Branches: refs/heads/master d856a8afb -> 10e64c047 [OPENMEETINGS-1717] redirect seems to work as expected in FF Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/10e64c04 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/10e64c04 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/10e64c04 Branch: refs/heads/master Commit: 10e64c0474b6ab79f55033e52c369851516621d5 Parents: d856a8a Author: Maxim SolodovnikAuthored: Mon Oct 9 13:45:39 2017 +0700 Committer: Maxim Solodovnik Committed: Mon Oct 9 13:45:39 2017 +0700 -- .../web/pages/auth/SignInDialog.java| 29 ++-- 1 file changed, 14 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/10e64c04/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java -- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java index d0196cb..6b56edd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java @@ -24,6 +24,7 @@ import static org.apache.openmeetings.web.app.Application.getAuthenticationStrat import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin; import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister; +import static org.apache.openmeetings.web.pages.auth.SignInPage.showAuth; import static org.apache.openmeetings.web.room.SwfPanel.SWF; import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK; @@ -44,8 +45,8 @@ import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior; import org.apache.openmeetings.web.pages.HashPage; import org.apache.openmeetings.web.util.NonClosableDialog; import org.apache.wicket.AttributeModifier; +import org.apache.wicket.Component; import org.apache.wicket.RestartResponseException; -import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.form.AjaxButton; @@ -272,22 +273,20 @@ public class SignInDialog extends NonClosableDialog { @Override protected void populateItem(final ListItem item) { - Button btn = new Button("oauthBtn"); final OAuthServer s = item.getModelObject(); - Image icon = new Image("icon", Model.of("")); - icon.setVisible(!Strings.isEmpty(s.getIconUrl())); - icon.add(AttributeModifier.replace("src", s.getIconUrl())); - btn.add(icon); - btn.add(new Label("label", s.getName())) - .add(new AjaxEventBehavior("click") { - private static final long serialVersionUID = 1L; + Button btn = new Button("oauthBtn") { + private static final long serialVersionUID = 1L; - @Override - protected void onEvent(AjaxRequestTarget target) { - SignInPage.showAuth(s, SignInDialog.this); - } - }); - item.add(btn); + @Override + public void onSubmit() { + showAuth(s, SignInDialog.this); + } + }; + Component icon = new Image("icon", Model.of("")) +
[jira] [Commented] (OPENMEETINGS-1717) OAuth2 login works weird in FF
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1717?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16196558#comment-16196558 ] ASF subversion and git services commented on OPENMEETINGS-1717: --- Commit 10e64c0474b6ab79f55033e52c369851516621d5 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=10e64c0 ] [OPENMEETINGS-1717] redirect seems to work as expected in FF > OAuth2 login works weird in FF > -- > > Key: OPENMEETINGS-1717 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1717 > Project: Openmeetings > Issue Type: Bug > Components: OAuth >Affects Versions: 3.3.2 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 3.3.3, 4.0.0 > > > OAuth2 login works weird in FF: > it shown something very fast and display no auth screen > (tested with Google OAuth) > Works as expected in Chrome -- This message was sent by Atlassian JIRA (v6.4.14#64029)