[openmeetings] branch java11-modules updated: no jira: unmerged file is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/java11-modules by this push:
new 470272eb6 no jira: unmerged file is fixed
470272eb6 is described below
commit 470272eb6f3311dbee6a66af7aac918d0c959dc1
Author: Maxim Solodovnik
AuthorDate: Thu Dec 29 13:52:15 2022 +0700
no jira: unmerged file is fixed
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index f88a05883..0a927a994 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -981,12 +981,8 @@ public class BackupImport {
/*
* # Import Recordings
*/
-<<< HEAD
- void importRecordings(File base) {
-===
// public for testing
- public void importRecordings(File base) throws Exception {
->>> 2590e5123 (The build is green)
+ public void importRecordings(File base) {
log.info("Meeting members import complete, starting recordings
server import");
final Map folders = new HashMap<>();
saveTree(base, "flvRecordings.xml", RECORDING_LIST_NODE,
RECORDING_NODE, Recording.class, folders, r -> {
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652728#comment-17652728 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit 5f70ffc73de0d5e402be6fd9b82967fdc992de24 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5f70ffc73 ] [OPENMEETINGS-2732] wicket-bootstrap > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2755) 2 factor authentication
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2755?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652736#comment-17652736 ] ASF subversion and git services commented on OPENMEETINGS-2755: --- Commit 636c21abdd1372ab3af8792c1f3de27f570ea43e in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=636c21abd ] [OPENMEETINGS-2755] NTP server is tested on startup > 2 factor authentication > --- > > Key: OPENMEETINGS-2755 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2755 > Project: Openmeetings > Issue Type: New Feature > Components: Security >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > I would like to add a ticket to investigate and look into adding 2 factor > authentication to OpenMeetings. As an optional feature, default would be > turned off. > There are various libraries to achieve 2 factor auth. I would probably prefer > using the Google Authenticator as a method since it seems the most widely > adopted authenticator. > In terms of turning it on/off I would add 2 flags: > - On a per server basis a flag to generally turn 2 factor auth on or off > - On a per individual account basis so you can turn 2 factor auth on/off for > an individual user > This would not affect past installations. > This would not affect logging in via Soap/Rest. > I think this would be a good feature to improve security. > mail thread: https://lists.apache.org/thread/rt9c4ho7q1s6txm5lymfjhpz6qlzysgp -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2253) Interruption of a video session when the microphone is turned on / off
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652730#comment-17652730 ] ASF subversion and git services commented on OPENMEETINGS-2253: --- Commit 554f405cb40b84e4cda825d66356ca580132976a in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=554f405cb ] [OPENMEETINGS-2253] self-echo fixed, again > Interruption of a video session when the microphone is turned on / off > -- > > Key: OPENMEETINGS-2253 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2253 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 5.0.0-M3 > Environment: Chrome, FF >Reporter: Evgeny >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > Attachments: icon_example.png, indication.png, whiteboard.png > > > Hello! > 1. The participant turns on the camera - a camera window appears. > 2. The participant turns on / off the microphone - the camera window closes, > after a delay of 2-3 seconds it opens, with a change from its original > position. > Each time the microphone is turned on / off, there is a delay and jerking of > the camera window of the conference participant, with the transition to the > default position. > For other participants, the camera of this participant also disappears on the > screen. > Please make one button to turn on / off together - both the camera and the > microphone. Or a hotkey. So that the participant at the beginning and at the > end of the conversation does not press the camera and microphone separately > on the buttons. > Thanks. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2253) Interruption of a video session when the microphone is turned on / off
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2253?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652729#comment-17652729 ] ASF subversion and git services commented on OPENMEETINGS-2253: --- Commit 163ccea9b52ef01954ad83ae207aeef2705da43e in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=163ccea9b ] [OPENMEETINGS-2253] self-echo 'fix' is reverted > Interruption of a video session when the microphone is turned on / off > -- > > Key: OPENMEETINGS-2253 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2253 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 5.0.0-M3 > Environment: Chrome, FF >Reporter: Evgeny >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > Attachments: icon_example.png, indication.png, whiteboard.png > > > Hello! > 1. The participant turns on the camera - a camera window appears. > 2. The participant turns on / off the microphone - the camera window closes, > after a delay of 2-3 seconds it opens, with a change from its original > position. > Each time the microphone is turned on / off, there is a delay and jerking of > the camera window of the conference participant, with the transition to the > default position. > For other participants, the camera of this participant also disappears on the > screen. > Please make one button to turn on / off together - both the camera and the > microphone. Or a hotkey. So that the participant at the beginning and at the > end of the conversation does not press the camera and microphone separately > on the buttons. > Thanks. -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652733#comment-17652733 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit eb7d05a9036e8a9212e7c061a02cdcdeaad5d73e in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=eb7d05a90 ] [OPENMEETINGS-2733] some Sonar issues > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2716) Dialogs below settings not responsive
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2716?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652727#comment-17652727 ] ASF subversion and git services commented on OPENMEETINGS-2716: --- Commit 58a8ef1aa3a4f52acd7464e5cd0a30eb06673d36 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=58a8ef1aa ] [OPENMEETINGS-2716] panels under Settings main menu are more responsive > Dialogs below settings not responsive > - > > Key: OPENMEETINGS-2716 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2716 > Project: Openmeetings > Issue Type: Improvement > Components: UI >Affects Versions: 6.2.0, 7.0.0 >Reporter: Uwe Simon >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > Attachments: image-2021-11-28-11-36-52-304.png, > image-2021-11-28-11-37-38-957.png > > > The dialogs below "Settings" are not "really" responsive. > For example "My profile" always has a 2 column layout. > Additionally left and right of the screen with some "empty space". > On a smartphone in "landscape mode" this is ok, but the "empty space" on left > and right should be removed for screen with less width. > In "portrait mode" a one column layout is much better - like in "Dashboard". > The empty space between photo and "Community settings" should be removed and > the [x]for deleting the photo should be directly beside the photo not at the > right edge od the screen. The "My profile" button at the bottom should be > moved to the top - for example right to the "change password" > > Similar behaviour in "Invitations" only 1 column layout in "portrait mode". > "Search Users" has the search fields in the left column, but "Contacts and > messages" at the top. > > !image-2021-11-28-11-36-52-304.png! > !image-2021-11-28-11-37-38-957.png! -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652734#comment-17652734 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit 34a2b06d7d83fdf0ceb741429e1083c7701bf2db in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=34a2b06d7 ] [OPENMEETINGS-2733] some Sonar issues > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652737#comment-17652737 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit 609e95faae1788382b21bd9b574eac1e72d400ce in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=609e95faa ] [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2754) Full screen mode for WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2754?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652725#comment-17652725 ] ASF subversion and git services commented on OPENMEETINGS-2754: --- Commit b0db1d65f41935257c2c8f7163a1239c0230d4d2 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=b0db1d65f ] [OPENMEETINGS-2754] confirmations are displayed in fullscreen-mode > Full screen mode for WB > --- > > Key: OPENMEETINGS-2754 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2754 > Project: Openmeetings > Issue Type: New Feature > Components: WhiteBoard >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > It should be possible to open WB in full screen -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652732#comment-17652732 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit ad1dd4e92449af6617a78e4c4978baebeff90a33 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=ad1dd4e92 ] [OPENMEETINGS-2733] some Sonar issues > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2755) 2 factor authentication
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2755?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652731#comment-17652731 ] ASF subversion and git services commented on OPENMEETINGS-2755: --- Commit a75f9b7ccf2c5c235d84258935687685bb0c4260 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a75f9b7cc ] [OPENMEETINGS-2755] 2 factor auth is added > 2 factor authentication > --- > > Key: OPENMEETINGS-2755 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2755 > Project: Openmeetings > Issue Type: New Feature > Components: Security >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > I would like to add a ticket to investigate and look into adding 2 factor > authentication to OpenMeetings. As an optional feature, default would be > turned off. > There are various libraries to achieve 2 factor auth. I would probably prefer > using the Google Authenticator as a method since it seems the most widely > adopted authenticator. > In terms of turning it on/off I would add 2 flags: > - On a per server basis a flag to generally turn 2 factor auth on or off > - On a per individual account basis so you can turn 2 factor auth on/off for > an individual user > This would not affect past installations. > This would not affect logging in via Soap/Rest. > I think this would be a good feature to improve security. > mail thread: https://lists.apache.org/thread/rt9c4ho7q1s6txm5lymfjhpz6qlzysgp -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2733) (7.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2733?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652735#comment-17652735 ] ASF subversion and git services commented on OPENMEETINGS-2733: --- Commit 8035ce0fc38b0c6470a5f7c80dfb9b2b56d1fba7 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=8035ce0fc ] [OPENMEETINGS-2733] some Sonar issues > (7.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2733 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2733 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2754) Full screen mode for WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2754?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652726#comment-17652726 ] ASF subversion and git services commented on OPENMEETINGS-2754: --- Commit e7a72d368ca36f3cda1892a59311f1378fdc3114 in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e7a72d368 ] [OPENMEETINGS-2754] build should be fixed > Full screen mode for WB > --- > > Key: OPENMEETINGS-2754 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2754 > Project: Openmeetings > Issue Type: New Feature > Components: WhiteBoard >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > It should be possible to open WB in full screen -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2753) Redo should be added to WB tool
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2753?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652724#comment-17652724 ] ASF subversion and git services commented on OPENMEETINGS-2753: --- Commit 306cb83e4aebd1bf5f109f322167cd11736b623d in openmeetings's branch refs/heads/java11-modules from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=306cb83e4 ] [OPENMEETINGS-2753] arabic translation > Redo should be added to WB tool > --- > > Key: OPENMEETINGS-2753 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2753 > Project: Openmeetings > Issue Type: New Feature > Components: WhiteBoard >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Redo should be added to WB tool -- This message was sent by Atlassian Jira (v8.20.10#820010)
[openmeetings] 01/10: no jira: project is partially converted to use java11 modules
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 5b2d2dd76d7bfb1d43ac2873e9f9bfc080c41413
Author: Maxim Solodovnik
AuthorDate: Tue Feb 18 00:32:32 2020 +0700
no jira: project is partially converted to use java11 modules
---
openmeetings-core/src/main/java/module-info.java | 40 +
openmeetings-db/src/main/java/module-info.java | 66 ++
.../apache/openmeetings/db/dao/label/LabelDao.java | 4 +-
openmeetings-util/src/main/java/module-info.java | 45 +++
4 files changed, 153 insertions(+), 2 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java
b/openmeetings-core/src/main/java/module-info.java
new file mode 100644
index 0..833be8717
--- /dev/null
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+module apache.openmeetings.core {
+ requires transitive apache.openmeetings.db;
+
+ requires transitive org.apache.commons.io;
+
+ requires transitive spring.context;
+
+ requires kurento.client;
+ requires kurento.commons;
+ requires kurento.jsonrpc.client;
+ requires java.activation;
+ requires com.google.gson;
+ requires java.mail;
+ requires api.all;
+ requires org.apache.tika.parsers;
+ requires java.xml;
+ requires xstream;
+
+ requires jodconverter.core;
+ requires jodconverter.local;
+}
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
new file mode 100644
index 0..2d01a8c92
--- /dev/null
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+module apache.openmeetings.db {
+ exports org.apache.openmeetings;
+ exports org.apache.openmeetings.db.dao;
+ exports org.apache.openmeetings.db.dao.basic;
+ exports org.apache.openmeetings.db.dao.calendar;
+ exports org.apache.openmeetings.db.dao.file;
+ exports org.apache.openmeetings.db.dao.label;
+ exports org.apache.openmeetings.db.dao.log;
+ exports org.apache.openmeetings.db.dao.record;
+ exports org.apache.openmeetings.db.dao.room;
+ exports org.apache.openmeetings.db.dao.server;
+ exports org.apache.openmeetings.db.dao.user;
+ exports org.apache.openmeetings.db.dto.basic;
+ exports org.apache.openmeetings.db.dto.calendar;
+ exports org.apache.openmeetings.db.dto.file;
+ exports org.apache.openmeetings.db.dto.record;
+ exports org.apache.openmeetings.db.dto.room;
+ exports org.apache.openmeetings.db.dto.user;
+ exports org.apache.openmeetings.db.entity;
+ exports org.apache.openmeetings.db.entity.basic;
+ exports org.apache.openmeetings.db.entity.calendar;
+ exports org.apache.openmeetings.db.entity.file;
+ exports org.apache.openmeetings.db.entity.label;
+ exports org.apache.openmeetings.db.entity.log;
+ exports org.apache.openmeetings.db.entity.record;
+ exports org.apache.openmeetings.db.entity.room;
+ exports org.apache.openmeetings.db.entity.server;
+ exports org.apache.openmeetings.db.entity.user;
+ exports org.apache.openmeetings.db.manager;
[openmeetings] 07/10: The build is green
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit a1ce10048e836a604d3ba3c224b458c932115ac3
Author: Maxim Solodovnik
AuthorDate: Thu Apr 21 15:52:27 2022 +0700
The build is green
---
.../openmeetings/db/util/ApplicationHelper.java| 6 ++-
.../apache/openmeetings/backup/BackupImport.java | 48 +++---
.../service/scheduler/ReminderJob.java | 4 +-
.../org/apache/openmeetings/backup/TestExport.java | 6 +--
.../mail/template/subject/TestSubjTemplate.java| 2 +-
5 files changed, 44 insertions(+), 22 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index d63c6c20a..89f3bee09 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -123,7 +123,11 @@ public class ApplicationHelper {
} catch(IllegalStateException e) {
app.setServletContext(new
MockServletContext(app, null));
}
-
app.setConfigurationType(RuntimeConfigurationType.DEPLOYMENT);
+ try {
+
app.setConfigurationType(RuntimeConfigurationType.DEPLOYMENT);
+ } catch (IllegalStateException e) {
+ // no-op, might be already set
+ }
OMContextListener omcl = new OMContextListener();
omcl.contextInitialized(new
ServletContextEvent(app.getServletContext()));
ThreadContext.setApplication(app);
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index ec9e84dbf..4f90579af 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -518,7 +518,8 @@ public class BackupImport {
messageFolderMap.put(TRASH_FOLDER_ID, TRASH_FOLDER_ID);
}
- static BackupVersion getVersion(File base) {
+ // public for testing
+ public static BackupVersion getVersion(File base) {
List list = new ArrayList<>(1);
readList(base, "version.xml", VERSION_LIST_NODE, VERSION_NODE,
BackupVersion.class, list::add, true);
return list.isEmpty() ? new BackupVersion() : list.get(0);
@@ -527,7 +528,8 @@ public class BackupImport {
/*
* # Import Configs
*/
- void importConfigs(File base) throws Exception {
+ // public for testing
+ public void importConfigs(File base) throws Exception {
final Map keyMap = new HashMap<>();
Arrays.stream(KeyEvent.class.getDeclaredFields())
.filter(fld -> fld.getName().startsWith("VK_"))
@@ -590,7 +592,8 @@ public class BackupImport {
/*
* # Import Groups
*/
- void importGroups(File base) {
+ // public for testing
+ public void importGroups(File base) {
log.info("Configs import complete, starting group import");
readList(base, "organizations.xml", GROUP_LIST_NODE,
GROUP_NODE, Group.class, g -> {
Long oldId = g.getId();
@@ -603,7 +606,8 @@ public class BackupImport {
/*
* # Import LDAP Configs
*/
- Long importLdap(File base) {
+ // public for testing
+ public Long importLdap(File base) {
log.info("Groups import complete, starting LDAP config import");
Long[] defaultLdapId = {cfgDao.getLong(CONFIG_DEFAULT_LDAP_ID,
null)};
readList(base, "ldapconfigs.xml", "ldapconfigs", "ldapconfig",
LdapConfig.class, c -> {
@@ -626,7 +630,8 @@ public class BackupImport {
/*
* # OAuth2 servers
*/
- void importOauth(File base) {
+ // public for testing
+ public void importOauth(File base) {
log.info("Ldap config import complete, starting OAuth2 server
import");
readList(base, "oauth2servers.xml", OAUTH_LIST_NODE,
OAUTH_NODE, OAuthServer.class
, s -> {
@@ -671,7 +676,8 @@ public class BackupImport {
/*
* # Import Users
*/
- void importUsers(File base) throws Exception {
+ // public for testing
+ public void importUsers(File base)
[openmeetings] 10/10: More work on JPMS
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit d205e21ff7c27eea3be324c61bee4befea58ffa2
Author: Maxim Solodovnik
AuthorDate: Thu Jul 14 15:48:18 2022 +0700
More work on JPMS
---
openmeetings-core/pom.xml | 1 -
openmeetings-core/src/main/java/module-info.java | 28 ++--
openmeetings-db/pom.xml| 1 -
openmeetings-db/src/main/java/module-info.java | 13 +++---
openmeetings-install/pom.xml | 1 -
.../src/main/java/module-info.java | 15 ---
openmeetings-mediaserver/pom.xml | 1 -
.../src/main/java/module-info.java | 16 ---
openmeetings-screenshare/pom.xml | 1 -
openmeetings-server/pom.xml| 1 -
openmeetings-service/pom.xml | 1 -
.../src/main/java/module-info.java | 20 +
openmeetings-util/pom.xml | 1 -
openmeetings-util/src/main/java/module-info.java | 36
openmeetings-util/src/test/java/module-info.test | 30 -
openmeetings-web/pom.xml | 1 -
openmeetings-web/src/main/java/module-info.java| 50 ++
.../openmeetings/web/admin/extra/ExtraPanel.java | 2 +-
.../util/logging/OpenMeetingsMetricsServlet.java | 3 +-
openmeetings-webservice/pom.xml| 1 -
.../src/main/java/module-info.java | 20 -
pom.xml| 12 --
22 files changed, 162 insertions(+), 93 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 02360662b..652baa6da 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -31,7 +31,6 @@
Module for OpenMeetings core classes and
services
${project.parent.basedir}
- apache.openmeetings.core
diff --git a/openmeetings-core/src/main/java/module-info.java
b/openmeetings-core/src/main/java/module-info.java
index 6495df2b8..ec9973b40 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -17,28 +17,30 @@
* under the License.
*/
-module apache.openmeetings.core {
- requires transitive apache.openmeetings.db;
+module org.apache.openmeetings.core {
+ exports org.apache.openmeetings.core.converter;
+ exports org.apache.openmeetings.core.data.file;
+ exports org.apache.openmeetings.core.ldap;
+ exports org.apache.openmeetings.core.mail;
+ exports org.apache.openmeetings.core.notifier;
+ exports org.apache.openmeetings.core.rss;
+ exports org.apache.openmeetings.core.sip;
+ exports org.apache.openmeetings.core.util;
+
+ requires transitive org.apache.openmeetings.db;
requires transitive org.apache.commons.io;
+ requires transitive java.annotation;
+ requires transitive java.xml;
- requires kurento.client;
- requires kurento.commons;
- requires kurento.jsonrpc.client;
- requires java.activation;
- requires com.google.gson;
- requires java.mail;
- requires java.xml;
requires xstream;
requires jodconverter.core;
requires jodconverter.local;
requires org.apache.directory.ldap.api.all;
- requires tika.parsers;
requires javax.inject;
- requires wicket.ioc;
- requires java.annotation;
- requires apache.openmeetings.util;
requires asterisk.java;
requires jain.sip.ri;
+ requires org.apache.tika.parsers;
+ requires jakarta.mail;
}
diff --git a/openmeetings-db/pom.xml b/openmeetings-db/pom.xml
index b6fd3e83f..f5eff2a9f 100644
--- a/openmeetings-db/pom.xml
+++ b/openmeetings-db/pom.xml
@@ -31,7 +31,6 @@
OpenMeetings module for all Database/DTO related
classes
${project.parent.basedir}
- apache.openmeetings.db
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index aa1690d87..f65ad04b8 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-module apache.openmeetings.db {
+module org.apache.openmeetings.db {
exports org.apache.openmeetings;
+ exports org.apache.openmeetings.db.bind;
+ exports org.apache.openmeetings.db.bind.adapter;
exports org.apache.openmeetings.db.dao;
exports org.apache.openmeetings.db.dao.basic;
exports org.apache.openmeetings.db.dao.calendar;
@@ -45,19
[openmeetings] branch java11-modules updated (3b58f6e45 -> d205e21ff)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git discard 3b58f6e45 More work on JPMS discard 9fcce5076 Build fixed discard 616f42e3b Code clean-up discard 2590e5123 The build is green discard 9b3345820 Some more work on modules discard 2f08db5a4 Another attempt to fix the build discard 81a5dfb0a some compilation errors are resolved discard 25f773860 OpenJpa modules were changed discard dcbcb1199 Simple-xml is dropped discard a1f058d0c no jira: project is partially converted to use java11 modules add 893aeaf8a [OPENMEETINGS-2732] jettison, jodconverter add 0b6434da4 [OPENMEETINGS-2732] reflow-skin, wicket-jquery-ui, tomcat, swagger add 4ea24d87f [OPENMEETINGS-2732] maven-site-plugin add 73b842e20 [OPENMEETINGS-2732] font-awesome, commons-text, slf4j add 57f4efb81 [OPENMEETINGS-2732] asterisk-java, tika-parsers and logback add b80940990 [OPENMEETINGS-2732] tomcat add c607616e3 no jira: unused imports are removed, .vscode is added to .gitignore add 3b78331eb [OPENMEETINGS-2732] wicket, wickestuff, cxf, mysql, logback, swagger, bytebuddy add 83e3911f1 [OPENMEETINGS-2732] ical4j, tika-parsers, mockito, swagger and plugins; code clean-up add 0ab86c954 [OPENMEETINGS-2732] spring, tomcat, ical4j, asterisk, slf4j, logback, mockito, swagger, bytebuddy add 36ddf4934 [OPENMEETINGS-2732] postgresql add de5d31c97 [OPENMEETINGS-2732] asterisk-java add 3fcc714e2 [OPENMEETINGS-2732] asterisk-java, ojdbc, slf4j add 601be4d44 [OPENMEETINGS-2732] tomcat, jettison add 92a8a51a6 [OPENMEETINGS-2253] RTC related JS code is simplified; deprecated kurento-utils-js is dropped add ffef66bcf [OPENMEETINGS-2732] tinyify, ua-parser-js, terser add af8a95df1 [OPENMEETINGS-2253] camera/microphone on/off is not causes media-stream re-negotiation add b1f5fdacc [OPENMEETINGS-2253] build should be fixed add eeac05a0a [OPENMEETINGS-2253] 'uuid' NPM module is replaced with 'crypto.randomUUID()' add 1c1f9479f [OPENMEETINGS-2732] node add d4e246007 [OPENMEETINGS-2732] node add 9e05fa506 [OPENMEETINGS-2253] video-pod size/position is preserved; code clean-up add 5d59add0e [OPENMEETINGS-131] basic push-to-talk add bfee43e2e [OPENMEETINGS-2715] Trash icon is disable if only non-deletable items are selected add e855cf586 [OPENMEETINGS-2677] NoSleep is enabled on first click add d1710840e [OPENMEETINGS-2732] parent pom, cxf, slf4j, mockito, bytebuddy add 9180b010e no jira: SIP instructions are improved a bit add 397127453 [OPENMEETINGS-2471] messages panel is improved add 478d4dca8 [OPENMEETINGS-2566] Group admin can send invitations to group add 7be6955cd [OPENMEETINGS-2732] jetty add 71110ae7a [OPENMEETINGS-2253] self-echo is removed add 7cd3e4316 [OPENMEETINGS-2753] Redo is added add fad82268c [OPENMEETINGS-2733] Sonar should be more happy add f8b0ffe61 [OPENMEETINGS-2753] Redo for clear-all should work; some Sonar issues are addressed add be1b691d4 [OPENMEETINGS-2754] full screen for WB add 306cb83e4 [OPENMEETINGS-2753] arabic translation add b0db1d65f [OPENMEETINGS-2754] confirmations are displayed in fullscreen-mode add e7a72d368 [OPENMEETINGS-2754] build should be fixed add 58a8ef1aa [OPENMEETINGS-2716] panels under Settings main menu are more responsive add 5f70ffc73 [OPENMEETINGS-2732] wicket-bootstrap add 163ccea9b [OPENMEETINGS-2253] self-echo 'fix' is reverted add 554f405cb [OPENMEETINGS-2253] self-echo fixed, again add a75f9b7cc [OPENMEETINGS-2755] 2 factor auth is added add 1630771f6 no jira: typo is fixed add ad1dd4e92 [OPENMEETINGS-2733] some Sonar issues add eb7d05a90 [OPENMEETINGS-2733] some Sonar issues add 34a2b06d7 [OPENMEETINGS-2733] some Sonar issues add 8035ce0fc [OPENMEETINGS-2733] some Sonar issues add 636c21abd [OPENMEETINGS-2755] NTP server is tested on startup add 609e95faa [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter new 5b2d2dd76 no jira: project is partially converted to use java11 modules new d6805ed83 Simple-xml is dropped new b4a4a8ee2 OpenJpa modules were changed new ce02e8294 some compilation errors are resolved new 7e1560b9d Another attempt to fix the build new 99d6a117f Some more work on modules new a1ce10048 The build is green new db1c0e948 Code clean-up new e275fc84d Build fixed new d205e21ff More work on JPMS This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3b58f6e45)
[openmeetings] 03/10: OpenJpa modules were changed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit b4a4a8ee22632c2afb4b3cf45290bf91e923e2f8
Author: Maxim Solodovnik
AuthorDate: Sun Mar 15 15:24:33 2020 +0700
OpenJpa modules were changed
---
openmeetings-db/src/main/java/module-info.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index b42eb42a0..120187f78 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -57,7 +57,7 @@ module apache.openmeetings.db {
requires spring.tx;
requires spring.context;
- requires java.persistence;
+ requires javax.persistence;
requires openjpa;
requires asterisk.java;
requires java.xml.bind;
[openmeetings] 08/10: Code clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit db1c0e9481c9bb671a8d83395253a55a3f3431aa
Author: Maxim Solodovnik
AuthorDate: Thu Apr 21 16:52:42 2022 +0700
Code clean-up
---
.../src/test/java/org/apache/openmeetings/backup/TestExport.java | 8
1 file changed, 8 deletions(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index 5e51cb8de..6325193a4 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -64,14 +64,6 @@ class TestExport extends AbstractOmServerTest {
JAXBContext jc = JAXBContext.newInstance(eClazz);
Marshaller marshaller = jc.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- /* FIXME TODO
- marshaller.setProperty(CharacterEscapeHandler.class.getName(),
new CharacterEscapeHandler() {
- @Override
- public void escape(char[] ac, int i, int j, boolean
flag, Writer writer) throws IOException {
- writer.write(ac, i, j);
- }
- });
- */
StringWriter writer = new StringWriter();
marshaller.marshal(u, writer);
Assertions.assertNotNull(writer.getBuffer());
[openmeetings] 09/10: Build fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit e275fc84df991f4cdf4a7d2f3a622b1e287c841b
Author: Maxim Solodovnik
AuthorDate: Tue May 17 10:51:32 2022 +0700
Build fixed
---
.../src/main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 4f90579af..f88a05883 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -501,7 +501,7 @@ public class BackupImport {
}
}
- void cleanup() {
+ public void cleanup() {
ldapMap.clear();
oauthMap.clear();
userMap.clear();
[openmeetings] 04/10: some compilation errors are resolved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit ce02e82946ea94ffc84172f618f54ba338ab4e89
Author: Maxim Solodovnik
AuthorDate: Sat Jul 3 13:00:04 2021 +0700
some compilation errors are resolved
---
openmeetings-core/src/main/java/module-info.java | 11 +--
openmeetings-db/src/main/java/module-info.java | 5 ++---
openmeetings-util/src/main/java/module-info.java | 12
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java
b/openmeetings-core/src/main/java/module-info.java
index 833be8717..7b874cd9c 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -30,11 +30,18 @@ module apache.openmeetings.core {
requires java.activation;
requires com.google.gson;
requires java.mail;
- requires api.all;
- requires org.apache.tika.parsers;
requires java.xml;
requires xstream;
requires jodconverter.core;
requires jodconverter.local;
+ requires org.apache.directory.ldap.api.all;
+ requires tika.core;
+ requires tika.parsers;
+ requires javax.inject;
+ requires wicket.ioc;
+ requires java.annotation;
+ requires apache.openmeetings.util;
+ requires asterisk.java;
+ requires jain.sip.ri;
}
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index 120187f78..d8849cf89 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.util.ws;
requires transitive apache.openmeetings.util;
- requires transitive org.apache.wicket.request;
- requires transitive org.apache.wicket.websocket.core;
+ requires transitive wicket.request;
+ requires transitive wicket.native.websocket.core;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
@@ -59,7 +59,6 @@ module apache.openmeetings.db {
requires spring.context;
requires javax.persistence;
requires openjpa;
- requires asterisk.java;
requires java.xml.bind;
requires org.apache.commons.text;
}
diff --git a/openmeetings-util/src/main/java/module-info.java
b/openmeetings-util/src/main/java/module-info.java
index 72dfb3c61..65ecb4f2b 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -22,16 +22,16 @@ module apache.openmeetings.util {
exports org.apache.openmeetings.util.mail;
exports org.apache.openmeetings.util.process;
exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
requires transitive javax.servlet.api;
- requires transitive org.apache.wicket.util;
- requires transitive org.apache.wicket.core;
- requires transitive org.apache.wicket.extensions;
+ requires transitive wicket.util;
+ requires transitive wicket.core;
+ requires transitive wicket.extensions;
requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
- requires transitive org.apache.tika.core;
requires transitive com.github.openjson;
requires transitive org.slf4j;
@@ -42,4 +42,8 @@ module apache.openmeetings.util {
requires transitive org.bouncycastle.provider;
requires transitive java.activation;
requires transitive org.mnode.ical4j.core;
+ requires transitive tika.core;
+ requires org.aspectj.tools;
+ requires spring.context;
+ requires simpleclient;
}
[openmeetings] 05/10: Another attempt to fix the build
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 7e1560b9d2ff4597103fa9a58d614089e6f51035
Author: Maxim Solodovnik
AuthorDate: Sat Jul 3 18:07:33 2021 +0700
Another attempt to fix the build
---
openmeetings-core/src/main/java/module-info.java | 3 ---
openmeetings-db/src/main/java/module-info.java | 1 -
openmeetings-util/src/main/java/module-info.java | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/openmeetings-core/src/main/java/module-info.java
b/openmeetings-core/src/main/java/module-info.java
index 7b874cd9c..6495df2b8 100644
--- a/openmeetings-core/src/main/java/module-info.java
+++ b/openmeetings-core/src/main/java/module-info.java
@@ -22,8 +22,6 @@ module apache.openmeetings.core {
requires transitive org.apache.commons.io;
- requires transitive spring.context;
-
requires kurento.client;
requires kurento.commons;
requires kurento.jsonrpc.client;
@@ -36,7 +34,6 @@ module apache.openmeetings.core {
requires jodconverter.core;
requires jodconverter.local;
requires org.apache.directory.ldap.api.all;
- requires tika.core;
requires tika.parsers;
requires javax.inject;
requires wicket.ioc;
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index d8849cf89..671932f9f 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -56,7 +56,6 @@ module apache.openmeetings.db {
requires transitive spring.core;
requires spring.tx;
- requires spring.context;
requires javax.persistence;
requires openjpa;
requires java.xml.bind;
diff --git a/openmeetings-util/src/main/java/module-info.java
b/openmeetings-util/src/main/java/module-info.java
index 65ecb4f2b..3032e41b1 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -44,6 +44,6 @@ module apache.openmeetings.util {
requires transitive org.mnode.ical4j.core;
requires transitive tika.core;
requires org.aspectj.tools;
- requires spring.context;
+ requires transitive spring.context;
requires simpleclient;
}
[openmeetings] 06/10: Some more work on modules
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 99d6a117ff1569561e9b4dcf0259e253e4a3e16d
Author: Maxim Solodovnik
AuthorDate: Fri Jul 23 10:22:37 2021 +0700
Some more work on modules
---
openmeetings-db/src/main/java/module-info.java | 4 +--
openmeetings-util/src/main/java/module-info.java | 37
openmeetings-util/src/test/java/module-info.test | 25
pom.xml | 10 +++
4 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index 671932f9f..aa1690d87 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -49,8 +49,8 @@ module apache.openmeetings.db {
exports org.apache.openmeetings.db.util.ws;
requires transitive apache.openmeetings.util;
- requires transitive wicket.request;
- requires transitive wicket.native.websocket.core;
+ requires transitive org.apache.wicket.request;
+ requires transitive org.apache.wicket.websocket.core;
requires transitive spring.beans;
requires transitive spring.web;
requires transitive spring.core;
diff --git a/openmeetings-util/src/main/java/module-info.java
b/openmeetings-util/src/main/java/module-info.java
index 3032e41b1..ecd52506e 100644
--- a/openmeetings-util/src/main/java/module-info.java
+++ b/openmeetings-util/src/main/java/module-info.java
@@ -16,34 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-module apache.openmeetings.util {
- exports org.apache.openmeetings.util;
- exports org.apache.openmeetings.util.crypt;
- exports org.apache.openmeetings.util.mail;
- exports org.apache.openmeetings.util.process;
- exports org.apache.openmeetings.util.ws;
- exports org.apache.openmeetings.util.logging;
-
- requires transitive javax.servlet.api;
-
- requires transitive wicket.util;
- requires transitive wicket.core;
- requires transitive wicket.extensions;
+module org.apache.openmeetings.util {
+ requires transitive org.apache.wicket.util;
+ requires transitive org.apache.wicket.core;
+ requires transitive org.apache.wicket.extensions;
requires transitive org.apache.commons.codec;
requires transitive org.apache.commons.lang3;
requires transitive com.github.openjson;
requires transitive org.slf4j;
- requires transitive logback.classic;
- requires transitive logback.core;
- requires transitive dom4j;
- requires transitive jcip.annotations;
requires transitive org.bouncycastle.provider;
- requires transitive java.activation;
+ requires transitive jakarta.activation;
requires transitive org.mnode.ical4j.core;
- requires transitive tika.core;
requires org.aspectj.tools;
+ requires transitive javax.servlet.api;
+ requires transitive tika.core;
requires transitive spring.context;
+ requires transitive logback.classic;
+ requires transitive logback.core;
+ requires transitive dom4j;
+ requires transitive jcip.annotations;
requires simpleclient;
+
+ exports org.apache.openmeetings.util;
+ exports org.apache.openmeetings.util.crypt;
+ exports org.apache.openmeetings.util.mail;
+ exports org.apache.openmeetings.util.process;
+ exports org.apache.openmeetings.util.ws;
+ exports org.apache.openmeetings.util.logging;
}
diff --git a/openmeetings-util/src/test/java/module-info.test
b/openmeetings-util/src/test/java/module-info.test
new file mode 100644
index 0..5987c837c
--- /dev/null
+++ b/openmeetings-util/src/test/java/module-info.test
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+module org.apache.openmeetings.util.test {
+ requires transitive org.apache.openmeetings.util;
+
+ //tests
+ requires o
[openmeetings] 02/10: Simple-xml is dropped
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit d6805ed83ab0a6dcae261ead28a006f2dc9a3282
Author: Maxim Solodovnik
AuthorDate: Sat Mar 14 11:03:03 2020 +0700
Simple-xml is dropped
---
openmeetings-db/src/main/java/module-info.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/openmeetings-db/src/main/java/module-info.java
b/openmeetings-db/src/main/java/module-info.java
index 2d01a8c92..b42eb42a0 100644
--- a/openmeetings-db/src/main/java/module-info.java
+++ b/openmeetings-db/src/main/java/module-info.java
@@ -52,7 +52,6 @@ module apache.openmeetings.db {
requires transitive org.apache.wicket.request;
requires transitive org.apache.wicket.websocket.core;
requires transitive spring.beans;
- requires transitive simple.xml;
requires transitive spring.web;
requires transitive spring.core;
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652723#comment-17652723 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit 609e95faae1788382b21bd9b574eac1e72d400ce in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=609e95faa ] [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2732) (7.0.0) Libraries should be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2732?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652721#comment-17652721 ] ASF subversion and git services commented on OPENMEETINGS-2732: --- Commit 609e95faae1788382b21bd9b574eac1e72d400ce in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=609e95faa ] [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter > (7.0.0) Libraries should be updated > --- > > Key: OPENMEETINGS-2732 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2732 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > Libraries should be updated -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652722#comment-17652722 ] ASF subversion and git services commented on OPENMEETINGS-2756: --- Commit 461ff8497deeeb96788a7e700d904bbc504a5296 in openmeetings's branch refs/heads/spring-6 from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=461ff8497 ] [OPENMEETINGS-2756] spring, cxf, tomcat, wicket > Migration to Jakarta > > > Key: OPENMEETINGS-2756 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2756 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > > Multiple components should be migrated to modern stack: > * spring > * wicket-10 > * cxf-4 > * tomcat-10 > * ... -- This message was sent by Atlassian Jira (v8.20.10#820010)
[openmeetings] 02/02: [OPENMEETINGS-2756] spring, cxf, tomcat, wicket
This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 461ff8497deeeb96788a7e700d904bbc504a5296 Author: Maxim Solodovnik AuthorDate: Thu Dec 29 13:34:15 2022 +0700 [OPENMEETINGS-2756] spring, cxf, tomcat, wicket --- .../java/org/apache/openmeetings/IApplication.java | 2 +- .../openmeetings/db/util/ApplicationHelper.java| 6 ++--- openmeetings-server/pom.xml| 2 +- .../calendar/caldav/AppointmentManager.java| 4 ++-- .../calendar/caldav/handler/CtagHandler.java | 2 +- .../calendar/caldav/handler/EtagsHandler.java | 6 ++--- .../calendar/caldav/handler/MultigetHandler.java | 2 +- .../calendar/caldav/handler/WebDAVSyncHandler.java | 8 +++ .../openmeetings/util/OMContextListener.java | 4 ++-- .../web/common/upload/UploadResourceReference.java | 2 +- .../web/room/GroupCustomCssResourceReference.java | 2 +- .../openmeetings/web/user/chat/ChatToolbar.java| 2 +- .../web/util/FileItemResourceReference.java| 2 +- .../web/util/GroupLogoResourceReference.java | 2 +- .../web/util/ProfileImageResourceReference.java| 2 +- .../org/apache/openmeetings/backup/TestExport.java | 4 ++-- .../web/app/TestOmAuthenticationStrategy.java | 2 +- .../webservice/AbstractWebServiceTest.java | 11 - .../webservice/TestCalendarService.java| 4 ++-- .../openmeetings/webservice/TestErrorService.java | 2 +- .../openmeetings/webservice/TestGroupService.java | 8 +++ .../openmeetings/webservice/TestUserService.java | 6 ++--- .../webservice/CalendarWebService.java | 24 +-- .../openmeetings/webservice/ErrorWebService.java | 20 .../openmeetings/webservice/FileWebService.java| 24 +-- .../openmeetings/webservice/GroupWebService.java | 22 +- .../openmeetings/webservice/InfoWebService.java| 12 +- .../openmeetings/webservice/NetTestWebService.java | 19 +++ .../webservice/RecordingWebService.java| 20 .../openmeetings/webservice/RoomWebService.java| 27 ++ .../openmeetings/webservice/UserWebService.java| 24 +-- .../openmeetings/webservice/WbWebService.java | 23 +- .../webservice/error/ServiceException.java | 2 +- .../util/AppointmentListMessageBodyWriter.java | 10 .../util/AppointmentMessageBodyReader.java | 10 .../util/AppointmentMessageBodyWriter.java | 10 .../webservice/util/AppointmentParamConverter.java | 2 +- .../webservice/util/CalendarParamConverter.java| 2 +- .../webservice/util/DateParamConverter.java| 2 +- .../webservice/util/OmExceptionHandler.java| 4 ++-- .../webservice/util/OmParamConverterProvider.java | 4 ++-- .../webservice/util/RateLimitRequestFilter.java| 15 ++-- .../openmeetings/webservice/util/RateLimited.java | 2 +- .../webservice/util/UserMessageBodyWriter.java | 10 .../webservice/util/UserParamConverter.java| 2 +- pom.xml| 26 ++--- 46 files changed, 200 insertions(+), 201 deletions(-) diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java index d078f2945..fb0695fa1 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java @@ -23,7 +23,7 @@ import java.util.Set; import java.util.function.Supplier; import javax.annotation.Nonnull; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.util.ws.IClusterWsMessage; diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java index d63c6c20a..6769691e9 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java @@ -29,9 +29,9 @@ import java.util.Enumeration; import java.util.Map; import java.util.UUID; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.IWebSession; diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml index 60380e4f4..
[openmeetings] branch master updated (636c21abd -> 609e95faa)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git from 636c21abd [OPENMEETINGS-2755] NTP server is tested on startup add 609e95faa [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter No new revisions were added by this update. Summary of changes: pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[openmeetings] branch spring-6 created (now 461ff8497)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch spring-6 in repository https://gitbox.apache.org/repos/asf/openmeetings.git at 461ff8497 [OPENMEETINGS-2756] spring, cxf, tomcat, wicket This branch includes the following new commits: new 609e95faa [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter new 461ff8497 [OPENMEETINGS-2756] spring, cxf, tomcat, wicket The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[openmeetings] 01/02: [OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 609e95faae1788382b21bd9b574eac1e72d400ce
Author: Maxim Solodovnik
AuthorDate: Thu Dec 29 12:47:13 2022 +0700
[OPENMEETINGS-2732] aspectjtools, xstream, mockito, jodconverter
---
pom.xml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3ac6bfda6..0c3768e53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
4.0.0-beta4
3.5.5
0.16.0
- 1.9.9.1
+ 1.9.19
2.7.1
1.5.3
${project.basedir}
@@ -113,7 +113,7 @@
8.0.31
11.2.1.jre17
19.17.0.0
- 1.4.19
+ 1.4.20
2.1.2
1.0.5
2.6.0
@@ -122,12 +122,12 @@
9.4.50.v20221201
test
1.70
- 4.10.0
+ 4.11.0
2.3.2
6.18.0
1.2.307
3.1.3-2
- 4.4.4
+ 4.4.5
2.3.7
3.1.0
0.2.3-2
[jira] [Updated] (OPENMEETINGS-2756) Migration to Jakarta
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2756?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2756: --- Description: Multiple components should be migrated to modern stack: * spring * wicket-10 * cxf-4 * tomcat-10 * ... was: Multiple components should be migrated to modern stack: * spring * wicket-10 * cxf-4 * ... > Migration to Jakarta > > > Key: OPENMEETINGS-2756 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2756 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 7.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > > Multiple components should be migrated to modern stack: > * spring > * wicket-10 > * cxf-4 > * tomcat-10 > * ... -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Created] (OPENMEETINGS-2756) Migration to Jakarta
Maxim Solodovnik created OPENMEETINGS-2756: -- Summary: Migration to Jakarta Key: OPENMEETINGS-2756 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2756 Project: Openmeetings Issue Type: Task Components: Builds Affects Versions: 7.0.0 Reporter: Maxim Solodovnik Assignee: Maxim Solodovnik Multiple components should be migrated to modern stack: * spring * wicket-10 * cxf-4 * ... -- This message was sent by Atlassian Jira (v8.20.10#820010)
[jira] [Commented] (OPENMEETINGS-2755) 2 factor authentication
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2755?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17652516#comment-17652516 ] ASF subversion and git services commented on OPENMEETINGS-2755: --- Commit 636c21abdd1372ab3af8792c1f3de27f570ea43e in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=636c21abd ] [OPENMEETINGS-2755] NTP server is tested on startup > 2 factor authentication > --- > > Key: OPENMEETINGS-2755 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2755 > Project: Openmeetings > Issue Type: New Feature > Components: Security >Affects Versions: 6.3.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 7.0.0 > > > I would like to add a ticket to investigate and look into adding 2 factor > authentication to OpenMeetings. As an optional feature, default would be > turned off. > There are various libraries to achieve 2 factor auth. I would probably prefer > using the Google Authenticator as a method since it seems the most widely > adopted authenticator. > In terms of turning it on/off I would add 2 flags: > - On a per server basis a flag to generally turn 2 factor auth on or off > - On a per individual account basis so you can turn 2 factor auth on/off for > an individual user > This would not affect past installations. > This would not affect logging in via Soap/Rest. > I think this would be a good feature to improve security. > mail thread: https://lists.apache.org/thread/rt9c4ho7q1s6txm5lymfjhpz6qlzysgp -- This message was sent by Atlassian Jira (v8.20.10#820010)
[openmeetings] branch master updated: [OPENMEETINGS-2755] NTP server is tested on startup
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 636c21abd [OPENMEETINGS-2755] NTP server is tested on startup
636c21abd is described below
commit 636c21abdd1372ab3af8792c1f3de27f570ea43e
Author: Maxim Solodovnik
AuthorDate: Wed Dec 28 22:11:01 2022 +0700
[OPENMEETINGS-2755] NTP server is tested on startup
---
.../main/java/org/apache/openmeetings/web/app/OtpManager.java | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
index 73f220e67..3da9facf6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
@@ -47,6 +47,8 @@ import dev.samstevens.totp.recovery.RecoveryCodeGenerator;
import dev.samstevens.totp.secret.DefaultSecretGenerator;
import dev.samstevens.totp.secret.SecretGenerator;
import dev.samstevens.totp.time.NtpTimeProvider;
+import dev.samstevens.totp.time.SystemTimeProvider;
+import dev.samstevens.totp.time.TimeProvider;
@Service
public class OtpManager {
@@ -69,7 +71,14 @@ public class OtpManager {
@PostConstruct
public void init() throws UnknownHostException {
codeGenerator = new DefaultCodeGenerator(ALGORITHM, DIGITS);
- final DefaultCodeVerifier verifier = new
DefaultCodeVerifier(codeGenerator, new NtpTimeProvider(ntpServer, ntpTimeout));
+ TimeProvider timeProvider;
+ try {
+ timeProvider = new NtpTimeProvider(ntpServer,
ntpTimeout);
+ } catch (UnknownHostException e) {
+ log.error("Unable to create NTP time provider, fallback
to system, Please CHECK your setup", e);
+ timeProvider = new SystemTimeProvider();
+ }
+ final DefaultCodeVerifier verifier = new
DefaultCodeVerifier(codeGenerator, timeProvider);
verifier.setTimePeriod(PERIOD);
codeVerifier = verifier;
}
