You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/29 08:38:57 UTC
[4/4] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
[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/76abbfa7
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/76abbfa7
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/76abbfa7
Branch: refs/heads/master
Commit: 76abbfa785edc858984d7df5bbb28e0acf93d22b
Parents: f869045
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Sep 29 15:38:45 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Sep 29 15:38:45 2017 +0700
----------------------------------------------------------------------
.../core/converter/BaseConverter.java | 4 +-
.../core/converter/DocumentConverter.java | 4 +-
.../core/converter/FlvExplorerConverter.java | 4 +-
.../core/converter/ImageConverter.java | 4 +-
.../core/converter/InterviewConverter.java | 4 +-
.../core/converter/RecordingConverter.java | 4 +-
.../core/data/file/FileProcessor.java | 4 +-
.../converter/InterviewConverterTask.java | 4 +-
.../converter/RecordingConverterTask.java | 4 +-
.../data/record/listener/StreamListener.java | 4 +-
.../record/listener/async/BaseStreamWriter.java | 4 +-
.../listener/async/StreamAudioWriter.java | 4 +-
.../listener/async/StreamVideoWriter.java | 4 +-
.../core/data/whiteboard/WhiteboardCache.java | 7 +--
.../core/documents/LibraryChartLoader.java | 4 +-
.../core/ldap/LdapLoginManagement.java | 4 +-
.../openmeetings/core/ldap/LdapOptions.java | 4 +-
.../openmeetings/core/mail/MailHandler.java | 8 +--
.../core/notifier/NotifierService.java | 4 +-
.../openmeetings/core/remote/MainService.java | 2 +-
.../openmeetings/core/remote/MobileService.java | 4 +-
.../core/remote/RecordingService.java | 4 +-
.../core/remote/ScopeApplicationAdapter.java | 17 +++---
.../openmeetings/core/rss/LoadAtomRssFeed.java | 4 +-
.../core/session/SessionManager.java | 4 +-
.../core/util/StrongPasswordValidator.java | 4 +-
.../openmeetings/core/util/WebSocketHelper.java | 14 ++---
.../test/EditorPaneLinkDetector.java | 4 +-
.../test/asf/AsfCopyRightReplace.java | 4 +-
.../test/jai/TestInterpolation.java | 4 +-
.../test/rdc/TestKeyCodesNumber.java | 4 +-
.../test/rdc/TestReadKeyCodesNumber.java | 4 +-
.../openmeetings/test/rtmp/SimulateLoad.java | 4 +-
.../test/rtmp/SimulateLoadTest.java | 4 +-
.../openmeetings/test/user/TestMailSending.java | 4 +-
.../db/dao/basic/ConfigurationDao.java | 34 ++++++-----
.../db/dao/calendar/AppointmentDao.java | 4 +-
.../db/dao/calendar/MeetingMemberDao.java | 4 +-
.../db/dao/file/BaseFileItemDao.java | 4 +-
.../openmeetings/db/dao/file/FileItemDao.java | 4 +-
.../db/dao/file/FileItemLogDao.java | 4 +-
.../openmeetings/db/dao/label/LabelDao.java | 4 +-
.../db/dao/log/ConferenceLogDao.java | 4 +-
.../db/dao/record/RecordingDao.java | 4 +-
.../db/dao/record/RecordingMetaDataDao.java | 4 +-
.../db/dao/record/RecordingMetaDeltaDao.java | 4 +-
.../openmeetings/db/dao/room/InvitationDao.java | 4 +-
.../openmeetings/db/dao/room/PollDao.java | 4 +-
.../openmeetings/db/dao/room/RoomDao.java | 4 +-
.../db/dao/server/LdapConfigDao.java | 4 +-
.../db/dao/server/SOAPLoginDao.java | 4 +-
.../db/dao/server/SessiondataDao.java | 4 +-
.../db/dao/user/PrivateMessageDao.java | 4 +-
.../db/dao/user/PrivateMessageFolderDao.java | 4 +-
.../db/dao/user/UserContactDao.java | 4 +-
.../openmeetings/db/dao/user/UserDao.java | 4 +-
.../apache/openmeetings/db/dto/basic/Info.java | 5 +-
.../openmeetings/db/dto/room/InvitationDTO.java | 4 +-
.../db/entity/server/RemoteSessionObject.java | 4 +-
.../openmeetings/db/util/ApplicationHelper.java | 18 +++---
.../openmeetings/db/util/AuthLevelUtil.java | 4 +-
.../openmeetings/db/util/LocaleHelper.java | 4 +-
.../openmeetings/db/util/TimezoneUtil.java | 4 +-
.../openmeetings/backup/BackupExport.java | 4 +-
.../openmeetings/backup/BackupImport.java | 4 +-
.../backup/RecordingStatusConverter.java | 4 +-
.../java/org/apache/openmeetings/cli/Admin.java | 4 +-
.../installation/ImportInitvalues.java | 8 +--
.../service/calendar/AppointmentLogic.java | 4 +-
.../calendar/caldav/AppointmentManager.java | 4 +-
.../calendar/caldav/handler/CtagHandler.java | 4 +-
.../calendar/caldav/handler/EtagsHandler.java | 4 +-
.../caldav/handler/MultigetHandler.java | 4 +-
.../caldav/handler/WebDAVSyncHandler.java | 4 +-
.../service/calendar/caldav/iCalUtils.java | 4 +-
.../calendar/caldav/methods/SyncMethod.java | 4 +-
.../openmeetings/service/mail/EmailManager.java | 14 +++--
.../service/notifier/TextNotifier.java | 4 +-
.../service/quartz/scheduler/AbstractJob.java | 8 +--
.../service/quartz/scheduler/CleanupJob.java | 14 ++---
.../service/quartz/scheduler/ReminderJob.java | 8 +--
.../service/room/InvitationManager.java | 4 +-
.../openmeetings/service/user/UserManager.java | 4 +-
.../openmeetings/util/CalendarPatterns.java | 4 +-
.../openmeetings/util/OMContextListener.java | 9 ++-
.../util/OpenmeetingsVariables.java | 64 +++++++++++++++++---
.../apache/openmeetings/util/StoredFile.java | 4 +-
.../org/apache/openmeetings/util/Version.java | 2 +-
.../openmeetings/util/crypt/CryptProvider.java | 11 ++--
.../util/crypt/MD5Implementation.java | 4 +-
.../util/crypt/SCryptImplementation.java | 4 +-
.../openmeetings/util/mail/IcalHandler.java | 4 +-
.../process/ConverterProcessResultList.java | 4 +-
.../util/process/ProcessHelper.java | 6 +-
.../web/admin/backup/BackupPanel.java | 4 +-
.../web/admin/labels/LangPanel.java | 4 +-
.../openmeetings/web/admin/users/UserForm.java | 4 +-
.../openmeetings/web/app/Application.java | 16 ++---
.../apache/openmeetings/web/app/WebSession.java | 4 +-
.../web/common/ErrorMessagePanel.java | 4 +-
.../openmeetings/web/common/InvitationForm.java | 4 +-
.../openmeetings/web/common/MainPanel.java | 4 +-
.../web/common/UploadableImagePanel.java | 4 +-
.../openmeetings/web/pages/NotInitedPage.java | 5 +-
.../web/pages/auth/ForgetPasswordDialog.java | 4 +-
.../web/pages/auth/RegisterDialog.java | 4 +-
.../web/pages/auth/SignInDialog.java | 4 +-
.../openmeetings/web/pages/auth/SignInPage.java | 4 +-
.../web/pages/install/InstallWizard.java | 4 +-
.../openmeetings/web/room/RoomBroadcaster.java | 4 +-
.../apache/openmeetings/web/room/RoomPanel.java | 4 +-
.../apache/openmeetings/web/room/SwfPanel.java | 8 +--
.../openmeetings/web/room/VideoSettings.java | 10 +--
.../web/room/activities/ActivitiesPanel.java | 4 +-
.../web/room/menu/RoomInvitationForm.java | 4 +-
.../web/room/menu/StartSharingButton.java | 4 +-
.../web/room/sidebar/RoomSidebar.java | 4 +-
.../web/room/wb/AbstractWbPanel.java | 4 +-
.../openmeetings/web/room/wb/WbPanel.java | 4 +-
.../web/user/calendar/AppointmentDialog.java | 4 +-
.../web/user/calendar/CalendarPanel.java | 4 +-
.../apache/openmeetings/web/user/chat/Chat.java | 4 +-
.../web/user/profile/ChangePasswordDialog.java | 4 +-
.../web/user/profile/ProfileForm.java | 4 +-
.../web/util/FileItemResourceReference.java | 4 +-
.../web/util/GroupLogoResourceReference.java | 4 +-
.../web/util/ProfileImageResourceReference.java | 4 +-
.../web/util/UserDashboardPersister.java | 4 +-
.../test/AbstractJUnitDefaults.java | 8 +--
.../test/backup/TestOldBackups.java | 4 +-
.../calendar/TestAppointmentAddAppointment.java | 4 +-
.../calendar/TestAppointmentSchedulerTask.java | 4 +-
.../TestDatabaseStructureAppointment.java | 4 +-
...tDatabaseStructureGetAppointmentByRange.java | 4 +-
.../TestDatabaseStructureGetUserStart.java | 4 +-
.../TestDatabaseStructureUsersSearch.java | 4 +-
.../test/calendar/TestGetAppointment.java | 4 +-
.../test/calendar/TestSendIcalMessage.java | 4 +-
.../openmeetings/test/config/TestConfig.java | 4 +-
.../test/derby/PrepareSystemFiles.java | 4 +-
.../openmeetings/test/domain/TestAddGroup.java | 4 +-
.../test/domain/TestUserGroupAggregation.java | 4 +-
.../test/selenium/SeleniumUtils.java | 4 +-
.../openmeetings/webservice/BaseWebService.java | 9 ++-
.../webservice/CalendarWebService.java | 4 +-
.../webservice/ErrorWebService.java | 4 +-
.../openmeetings/webservice/FileWebService.java | 4 +-
.../webservice/GroupWebService.java | 4 +-
.../webservice/NetTestWebService.java | 4 +-
.../webservice/RecordingWebService.java | 4 +-
.../openmeetings/webservice/RoomWebService.java | 8 +--
.../openmeetings/webservice/UserWebService.java | 10 +--
152 files changed, 441 insertions(+), 386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/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 7096ed4..987c22a 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
@@ -26,7 +26,7 @@ import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_FFMPEG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_IMAGEMAGIC;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_SOX;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.IOException;
@@ -57,7 +57,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class BaseConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(BaseConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(BaseConverter.class, getWebAppRootKey());
private static final Pattern p = Pattern.compile("\\d{2,5}(x)\\d{2,5}");
public final static String EXEC_EXT = System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") < 0 ? "" : ".exe";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
index 999440e..81639e9 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/DocumentConverter.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.core.converter;
import static org.apache.commons.io.FileUtils.copyFile;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PDF;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_PATH_OFFICE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Component;
@Component
public class DocumentConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(DocumentConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(DocumentConverter.class, getWebAppRootKey());
@Autowired
protected ConfigurationDao cfgDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
index afd8606..9a50a52 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.core.converter;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.nio.file.Files;
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
@Component
public class FlvExplorerConverter extends BaseConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(FlvExplorerConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FlvExplorerConverter.class, getWebAppRootKey());
public List<ConverterProcessResult> convertToMP4(FileItem f, String ext) {
List<ConverterProcessResult> logs = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index 259f312..5924f2f 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -28,7 +28,7 @@ import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir
import static org.apache.openmeetings.util.OmFileHelper.profileFileName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.util.process.ConverterProcessResult.ZERO;
import static org.apache.tika.metadata.HttpHeaders.CONTENT_TYPE;
@@ -61,7 +61,7 @@ import org.xml.sax.helpers.DefaultHandler;
@Component
public class ImageConverter extends BaseConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(ImageConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ImageConverter.class, getWebAppRootKey());
private static final String PAGE_TMPLT = DOC_PAGE_PREFIX + "-%04d." + EXTENSION_PNG;
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/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 86c917a..cd254ad 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
@@ -21,7 +21,7 @@ package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.IOException;
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Component;
@Component
public class InterviewConverter extends BaseConverter implements IRecordingConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(InterviewConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InterviewConverter.class, getWebAppRootKey());
private static class ReConverterParams {
private int leftSideLoud = 1;
private int rightSideLoud = 1;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
index cccf647..aae7980 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.core.converter;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.util.ArrayList;
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Component;
@Component
public class RecordingConverter extends BaseConverter implements IRecordingConverter {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingConverter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingConverter.class, getWebAppRootKey());
// Spring loaded Beans
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
index 70cb04a..ce6d5bd 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/file/FileProcessor.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.core.data.file;
import static org.apache.commons.io.FileUtils.copyFile;
import static org.apache.commons.io.FileUtils.copyInputStreamToFile;
import static org.apache.openmeetings.util.OmFileHelper.getFileExt;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.InputStream;
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Component;
@Component
public class FileProcessor {
- private static final Logger log = Red5LoggerFactory.getLogger(FileProcessor.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileProcessor.class, getWebAppRootKey());
//Spring loaded Beans
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
index 8431b1f..079a6ce 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/InterviewConverterTask.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.data.record.converter;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.apache.openmeetings.core.converter.InterviewConverter;
import org.red5.logging.Red5LoggerFactory;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
@Component
public class InterviewConverterTask {
- private static final Logger log = Red5LoggerFactory.getLogger(InterviewConverterTask.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InterviewConverterTask.class, getWebAppRootKey());
@Autowired
private TaskExecutor taskExecutor;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
index 1d98db5..9cc1c9f 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/converter/RecordingConverterTask.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.data.record.converter;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.apache.openmeetings.core.converter.RecordingConverter;
import org.red5.logging.Red5LoggerFactory;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
@Component
public class RecordingConverterTask {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingConverterTask.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingConverterTask.class, getWebAppRootKey());
@Autowired
private TaskExecutor taskExecutor;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
index cbfb6d7..b272438 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/StreamListener.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.data.record.listener;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
@@ -37,7 +37,7 @@ import org.red5.server.net.rtmp.event.VideoData;
import org.slf4j.Logger;
public class StreamListener implements IStreamListener {
- private static final Logger log = Red5LoggerFactory.getLogger(StreamListener.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StreamListener.class, getWebAppRootKey());
private final BaseStreamWriter streamWriter;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
index 1520204..182d38c 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.core.data.record.listener.async;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.IOException;
@@ -43,7 +43,7 @@ import org.red5.server.util.ScopeUtils;
import org.slf4j.Logger;
public abstract class BaseStreamWriter implements Runnable {
- private static final Logger log = Red5LoggerFactory.getLogger(BaseStreamWriter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(BaseStreamWriter.class, getWebAppRootKey());
private final static int MINUTE_MULTIPLIER = 60 * 1000;
public final static int TIME_TO_WAIT_FOR_FRAME = 15 * MINUTE_MULTIPLIER;
protected int startTimeStamp = -1;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
index 275ce23..4e51098 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamAudioWriter.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.data.record.listener.async;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.red5.io.IoConstants.TYPE_AUDIO;
import static org.red5.server.net.rtmp.event.VideoData.FrameType.KEYFRAME;
@@ -36,7 +36,7 @@ import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
public class StreamAudioWriter extends BaseStreamWriter {
- private static final Logger log = Red5LoggerFactory.getLogger(StreamAudioWriter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StreamAudioWriter.class, getWebAppRootKey());
private int duration = 0;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
index 8596042..d8956bf 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/StreamVideoWriter.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.data.record.listener.async;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.red5.server.net.rtmp.event.VideoData.FrameType.KEYFRAME;
import java.util.Date;
@@ -33,7 +33,7 @@ import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
public class StreamVideoWriter extends BaseStreamWriter {
- private static final Logger log = Red5LoggerFactory.getLogger(StreamVideoWriter.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StreamVideoWriter.class, getWebAppRootKey());
private Date startedSessionScreenTimeDate = null;
public StreamVideoWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData,
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
index 666a57c..555186a 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
@@ -18,16 +18,14 @@
*/
package org.apache.openmeetings.core.data.whiteboard;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.getApp;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.dto.room.Whiteboards;
-import org.apache.wicket.Application;
import com.hazelcast.core.IMap;
@@ -39,8 +37,7 @@ import com.hazelcast.core.IMap;
*/
public class WhiteboardCache {
private static IMap<Long, Whiteboards> getCache() {
- IApplication iapp = (IApplication)Application.get(wicketApplicationName);
- return iapp.getWhiteboards();
+ return getApp().getWhiteboards();
}
public static boolean tryLock(Long roomId) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
index d61296e..70227a6 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/LibraryChartLoader.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.core.documents;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.BufferedReader;
import java.io.File;
@@ -35,7 +35,7 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
public class LibraryChartLoader {
- private static final Logger log = Red5LoggerFactory.getLogger(LibraryChartLoader.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(LibraryChartLoader.class, getWebAppRootKey());
private static final String fileExt = ".xchart";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
index 3f191a0..1f0a0b7 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.db.util.LocaleHelper.validateCountry;
import static org.apache.openmeetings.util.OmException.BAD_CREDENTIALS;
import static org.apache.openmeetings.util.OmException.UNKNOWN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.Closeable;
import java.io.File;
@@ -80,7 +80,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class LdapLoginManagement {
- private static final Logger log = Red5LoggerFactory.getLogger(LdapLoginManagement.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(LdapLoginManagement.class, getWebAppRootKey());
// LDAP custom attribute mapping keys
private static final String CONFIGKEY_LDAP_KEY_LOGIN = "ldap_user_attr_login";
private static final String CONFIGKEY_LDAP_KEY_LASTNAME = "ldap_user_attr_lastname";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java
index 9e3f354..4cddf09 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapOptions.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.ldap;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Properties;
@@ -31,7 +31,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class LdapOptions {
- private static final Logger log = Red5LoggerFactory.getLogger(LdapOptions.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(LdapOptions.class, getWebAppRootKey());
private final static String EMPTY_FORMAT = "%s";
private static final String CONFIGKEY_LDAP_HOST = "ldap_conn_host";
private static final String CONFIGKEY_LDAP_PORT = "ldap_conn_port";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
index f4845c9..811b312 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
@@ -28,7 +28,8 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TIM
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TIMEOUT_CON;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_TLS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USER;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -58,7 +59,6 @@ import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.basic.MailMessageDao;
import org.apache.openmeetings.db.entity.basic.MailMessage;
import org.apache.openmeetings.db.entity.basic.MailMessage.Status;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.mail.MailUtil;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -77,7 +77,7 @@ import org.springframework.stereotype.Component;
*/
@Component("mailHandler")
public class MailHandler {
- private static final Logger log = Red5LoggerFactory.getLogger(MailHandler.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MailHandler.class, getWebAppRootKey());
private static final int MAIL_SEND_TIMEOUT = 60 * 60 * 1000; // 1 hour
private static final int MAXIMUM_ERROR_COUNT = 5;
@@ -270,7 +270,7 @@ public class MailHandler {
public void resetSendingStatus() {
log.debug("resetSendingStatus enter ...");
- if (!OpenmeetingsVariables.initComplete) {
+ if (!isInitComplete()) {
return;
}
Calendar c = Calendar.getInstance();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
index e5ad8d9..9cbe045 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/notifier/NotifierService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.notifier;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.ArrayList;
import java.util.List;
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Service;
*/
@Service
public class NotifierService {
- private static final Logger log = Red5LoggerFactory.getLogger(NotifierService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(NotifierService.class, getWebAppRootKey());
private List<INotifier> notifiers = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
index 4fc7f17..f423854 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Service;
*/
@Service
public class MainService implements IPendingServiceCallback {
- private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, OpenmeetingsVariables.getWebAppRootKey());
@Autowired
private AppointmentDao appointmentDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
index 9ad0c2d..ddd3b39 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MobileService.java
@@ -25,7 +25,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VE
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MYROOMS_ENABLED;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.util.Version.getVersion;
import java.io.Serializable;
@@ -72,7 +72,7 @@ import org.springframework.stereotype.Service;
@Service("mobile.service")
public class MobileService {
- private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MainService.class, getWebAppRootKey());
@Autowired
private ConfigurationDao cfgDao;
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
index a1239ab..88b4d93 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.getApp;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
import java.util.Map;
@@ -66,7 +66,7 @@ import com.github.openjson.JSONObject;
@Service
public class RecordingService implements IPendingServiceCallback {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingService.class, getWebAppRootKey());
/**
* Stores a reference to all available listeners we need that reference, as the internal references stored with the
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index a04d453..5aee16e 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -22,11 +22,13 @@ import static org.apache.openmeetings.util.OmFileHelper.HIBERNATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_CSP;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_HEADER_XFRAME;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.EXT_PROCESS_TTL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_CSP_SELF;
import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SAMEORIGIN;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setExtProcessTtl;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.ArrayList;
import java.util.HashMap;
@@ -52,7 +54,6 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.StreamClient;
import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.Version;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.TextRoomMessage;
@@ -76,7 +77,7 @@ import com.github.openjson.JSONObject;
@Service("web.handler")
public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter implements IPendingServiceCallback {
- private static final Logger _log = Red5LoggerFactory.getLogger(ScopeApplicationAdapter.class, webAppRootKey);
+ private static final Logger _log = Red5LoggerFactory.getLogger(ScopeApplicationAdapter.class, getWebAppRootKey());
private static final String SID_PARAM = "sid";
private static final String PARENT_SID_PARAM = "parentSid"; //mobile
private static final String MOBILE_PARAM = "mobileClient";
@@ -102,7 +103,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
private RecordingDao recordingDao;
public static IApplication getApp() {
- return (IApplication)Application.get(wicketApplicationName);
+ return (IApplication)Application.get(getWicketApplicationName());
}
@Override
@@ -130,13 +131,13 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
_log.debug("scopeName :: " + scopeName);
}
- OpenmeetingsVariables.initComplete = true;
+ setInitComplete(true);
// Init properties
IApplication iapp = getApp();
iapp.setXFrameOptions(cfgDao.getString(CONFIG_HEADER_XFRAME, HEADER_XFRAME_SAMEORIGIN));
iapp.setContentSecurityPolicy(cfgDao.getString(CONFIG_HEADER_CSP, HEADER_CSP_SELF));
iapp.updateJpaAddresses(cfgDao);
- EXT_PROCESS_TTL = cfgDao.getInt(CONFIG_EXT_PROCESS_TTL, EXT_PROCESS_TTL);
+ setExtProcessTtl(cfgDao.getInt(CONFIG_EXT_PROCESS_TTL, getExtProcessTtl()));
Version.logOMStarted();
recordingDao.resetProcessingStatus(); //we are starting so all processing recordings are now errors
} catch (Exception err) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
index c67b1d1..004a728 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/rss/LoadAtomRssFeed.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.rss;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.IOException;
import java.net.HttpURLConnection;
@@ -28,7 +28,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class LoadAtomRssFeed {
- private static final Logger log = Red5LoggerFactory.getLogger(LoadAtomRssFeed.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(LoadAtomRssFeed.class, getWebAppRootKey());
public static HttpURLConnection getFeedConnection(String _url) throws IOException {
log.debug("getFeedConnection:: " + _url);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
index f7c5a94..2fd71a5 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/session/SessionManager.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.core.session;
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.getApp;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Collection;
import java.util.Date;
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class SessionManager implements ISessionManager {
- protected static final Logger log = Red5LoggerFactory.getLogger(SessionManager.class, webAppRootKey);
+ protected static final Logger log = Red5LoggerFactory.getLogger(SessionManager.class, getWebAppRootKey());
private static Map<String, StreamClient> getClients() {
return getApp().getStreamClients();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
index 5e14cb3..d0097c9 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.util;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Map;
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
public class StrongPasswordValidator implements IValidator<String> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(StrongPasswordValidator.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StrongPasswordValidator.class, getWebAppRootKey());
private final int minLength;
private final boolean web;
private User u;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
index 0cff626..182ea62 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/WebSocketHelper.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.core.util;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.getApp;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.wicket.util.string.Strings.escapeMarkup;
import java.io.IOException;
@@ -41,7 +41,6 @@ import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.util.message.TextRoomMessage;
import org.apache.openmeetings.util.ws.IClusterWsMessage;
@@ -58,7 +57,7 @@ import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
public class WebSocketHelper {
- private static final Logger log = Red5LoggerFactory.getLogger(WebSocketHelper.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(WebSocketHelper.class, getWebAppRootKey());
public static final String ID_TAB_PREFIX = "chatTab-";
public static final String ID_ALL = ID_TAB_PREFIX + "all";
public static final String ID_ROOM_PREFIX = ID_TAB_PREFIX + "r";
@@ -197,7 +196,7 @@ public class WebSocketHelper {
if (publish) {
publish(new WsMessageAll(m));
}
- Application app = Application.get(OpenmeetingsVariables.wicketApplicationName);
+ Application app = (Application)getApp();
WebSocketSettings settings = WebSocketSettings.Holder.get(app);
IWebSocketConnectionRegistry reg = settings.getConnectionRegistry();
Executor executor = settings.getWebSocketPushMessageExecutor();
@@ -213,8 +212,7 @@ public class WebSocketHelper {
}
protected static void publish(IClusterWsMessage m) {
- IApplication iapp = (IApplication)Application.get(wicketApplicationName);
- iapp.publishWsTopic(m);
+ getApp().publishWsTopic(m);
}
protected static void sendRoom(final Long roomId, final JSONObject m, Predicate<Client> check, BiFunction<JSONObject, Client, String> func) {
@@ -237,7 +235,7 @@ public class WebSocketHelper {
, BiConsumer<IWebSocketConnection, Client> consumer
, Predicate<Client> check)
{
- Application app = Application.get(OpenmeetingsVariables.wicketApplicationName);
+ Application app = (Application)getApp();
WebSocketSettings settings = WebSocketSettings.Holder.get(app);
IWebSocketConnectionRegistry reg = settings.getConnectionRegistry();
Executor executor = settings.getWebSocketPushMessageExecutor();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
index e7a5c5b..d41c6d3 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/EditorPaneLinkDetector.java
@@ -23,7 +23,7 @@ package org.apache.openmeetings.test;
* Intern, SETLabs, Infosys Technologies Ltd. May 2004 - Jul 2004
* Ecole des Mines de Nantes, France
*/
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
@@ -57,7 +57,7 @@ import org.slf4j.Logger;
*/
public class EditorPaneLinkDetector extends JEditorPane {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(EditorPaneLinkDetector.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(EditorPaneLinkDetector.class, getWebAppRootKey());
/**
* Creates a <code>EditorPaneLinkDetector</code>.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
index acab791..2daa96f 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/asf/AsfCopyRightReplace.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.asf;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.BufferedReader;
import java.io.File;
@@ -34,7 +34,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class AsfCopyRightReplace {
- private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(AsfCopyRightReplace.class, getWebAppRootKey());
private static String asf_copyright = "/*\n"
+ " * Licensed to the Apache Software Foundation (ASF) under one\n"
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
index bd63cf7..1d4b831 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/jai/TestInterpolation.java
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.test.jai;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class TestInterpolation {
- private static final Logger log = Red5LoggerFactory.getLogger(TestInterpolation.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestInterpolation.class, getWebAppRootKey());
@Test
public void testInterpolate() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
index 50abd12..331f1bf 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestKeyCodesNumber.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.rdc;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.awt.event.KeyEvent;
@@ -27,7 +27,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class TestKeyCodesNumber {
- private static final Logger log = Red5LoggerFactory.getLogger(TestKeyCodesNumber.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestKeyCodesNumber.class, getWebAppRootKey());
@Test
public void testKeyCodes() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
index ac00aee..46acca5 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rdc/TestReadKeyCodesNumber.java
@@ -18,14 +18,14 @@
*/
package org.apache.openmeetings.test.rdc;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class TestReadKeyCodesNumber {
- private static final Logger log = Red5LoggerFactory.getLogger(TestReadKeyCodesNumber.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestReadKeyCodesNumber.class, getWebAppRootKey());
@Test
public void testTestKeyCodesNumber() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
index b68aa0f..8acd0fc 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoad.java
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.test.rtmp;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class SimulateLoad extends Thread {
- private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoad.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoad.class, getWebAppRootKey());
private LoadTestRtmpClient loadTestRtmpClient;
private boolean testRunning = true;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
index d9c316b..680166d 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/rtmp/SimulateLoadTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.rtmp;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.ArrayList;
import java.util.List;
@@ -28,7 +28,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class SimulateLoadTest {
- private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoadTest.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SimulateLoadTest.class, getWebAppRootKey());
private int numberOfClients = 25;
private List<SimulateLoad> simulateLoadList = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java b/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
index 1b7f4c7..baa145b 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/test/user/TestMailSending.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.user;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertTrue;
import javax.mail.Message;
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
*
*/
public class TestMailSending {
- private static final Logger log = Red5LoggerFactory.getLogger(TestMailSending.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestMailSending.class, getWebAppRootKey());
//Example GMail email server data
private String smtpServer = "smtp.gmail.com";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 65c3209..85c9ee9 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -40,7 +40,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ENAB
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MAX_UPLOAD_SIZE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.EXT_PROCESS_TTL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_BANDWIDTH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_ECHO_PATH;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_FPS;
@@ -51,12 +50,15 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SECURE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SSL_PORT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_VIDEO_CODEC;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ROOM_SETTINGS;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getConfigKeyCryptClassName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getRoomSettings;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.setApplicationName;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setConfigKeyCryptClassName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setExtProcessTtl;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setRoomSettings;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.FileInputStream;
@@ -107,7 +109,7 @@ import com.github.openjson.JSONObject;
@Repository
@Transactional
public class ConfigurationDao implements IDataProviderDao<Configuration> {
- private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ConfigurationDao.class, getWebAppRootKey());
public final static String[] searchFields = {"key", "value"};
@PersistenceContext
@@ -301,7 +303,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
reloadRoomSettings();
break;
case CONFIG_CRYPT:
- configKeyCryptClassName = value;
+ setConfigKeyCryptClassName(value);
CryptProvider.reset();
break;
case CONFIG_APPLICATION_NAME:
@@ -309,7 +311,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
break;
case CONFIG_HEADER_XFRAME:
{
- IApplication iapp = (IApplication)Application.get(wicketApplicationName);
+ IApplication iapp = (IApplication)Application.get(getWicketApplicationName());
if (iapp != null) {
iapp.setXFrameOptions(value);
}
@@ -317,14 +319,14 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
break;
case CONFIG_HEADER_CSP:
{
- IApplication iapp = (IApplication)Application.get(wicketApplicationName);
+ IApplication iapp = (IApplication)Application.get(getWicketApplicationName());
if (iapp != null) {
iapp.setContentSecurityPolicy(value);
}
}
break;
case CONFIG_EXT_PROCESS_TTL:
- EXT_PROCESS_TTL = Integer.parseInt(value);
+ setExtProcessTtl(Integer.parseInt(value));
break;
}
return entity;
@@ -352,13 +354,13 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
}
public String getCryptKey() {
- if (configKeyCryptClassName == null) {
+ if (getConfigKeyCryptClassName() == null) {
String cryptClass = getString(CONFIG_CRYPT, null);
if (cryptClass != null) {
- configKeyCryptClassName = cryptClass;
+ setConfigKeyCryptClassName(cryptClass);
}
}
- return configKeyCryptClassName;
+ return getConfigKeyCryptClassName();
}
public JSONObject reloadRoomSettings() {
@@ -367,7 +369,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
try (InputStream is = new FileInputStream(new File(new File(OmFileHelper.getRootDir(), "conf"), "red5.properties"))) {
props.load(is);
}
- ROOM_SETTINGS = new JSONObject()
+ setRoomSettings(new JSONObject()
.put(FLASH_SECURE, getBool(CONFIG_FLASH_SECURE, false))
.put(FLASH_NATIVE_SSL, "best".equals(getString(CONFIG_FLASH_SECURE_PROXY, "none")))
.put(FLASH_PORT, props.getProperty("rtmp.port"))
@@ -383,10 +385,10 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
.put("exclusive", getLong(CONFIG_KEYCODE_EXCLUSIVE, 123L))
.put("mute", getLong(CONFIG_KEYCODE_MUTE, 118L))
)
- ;
+ );
} catch (Exception e) {
log.error("Unexpected exception while reloading room settings: ", e);
}
- return ROOM_SETTINGS;
+ return getRoomSettings();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
index 8926205..8985b26 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.db.dao.calendar;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.ArrayList;
import java.util.Calendar;
@@ -52,7 +52,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class AppointmentDao {
- private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
index c928a1b..bb3ab4d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/MeetingMemberDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.HashSet;
import java.util.List;
@@ -36,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class MeetingMemberDao {
- private static final Logger log = Red5LoggerFactory.getLogger(MeetingMemberDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MeetingMemberDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
index f06a38a..da47729 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/BaseFileItemDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.file;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
import java.util.List;
@@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class BaseFileItemDao {
- private static final Logger log = Red5LoggerFactory.getLogger(BaseFileItemDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(BaseFileItemDao.class, getWebAppRootKey());
@PersistenceContext
protected EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
index c4bc478..14817f9 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.file;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.util.Collection;
@@ -46,7 +46,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class FileItemDao extends BaseFileItemDao {
- private static final Logger log = Red5LoggerFactory.getLogger(FileItemDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileItemDao.class, getWebAppRootKey());
public FileItem add(String fileName, Long parentId, Long ownerId, Long roomId, Long insertedBy,
Type type, String externalId, String externalType) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java
index b6a2f29..166edb0 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/file/FileItemLogDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.file;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
import java.util.List;
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class FileItemLogDao {
- private static final Logger log = Red5LoggerFactory.getLogger(FileItemLogDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileItemLogDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 524785d..b9d78bc 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.db.dao.label;
import static org.apache.openmeetings.db.util.ApplicationHelper._ensureApplication;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.io.IOException;
@@ -62,7 +62,7 @@ import org.slf4j.Logger;
*
*/
public class LabelDao implements IDataProviderDao<StringLabel>{
- private static final Logger log = Red5LoggerFactory.getLogger(LabelDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(LabelDao.class, getWebAppRootKey());
private static final String ENTRY_ELEMENT = "entry";
private static final String KEY_ATTR = "key";
public static final String APP_RESOURCES_EN = "Application.properties.xml";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
index ce924db..6c55732 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/log/ConferenceLogDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.log;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
@@ -35,7 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class ConferenceLogDao {
- private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ConferenceLogDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
index 8c313b1..bdecf0b 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.record;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.time.Duration;
import java.time.Instant;
@@ -49,7 +49,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class RecordingDao extends BaseFileItemDao {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingDao.class, getWebAppRootKey());
@Autowired
private UserDao userDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
index b268c86..84d6bf7 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.record;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
import java.util.List;
@@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class RecordingMetaDataDao {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDataDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDataDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
@Autowired
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
index fa8ed47..2cc86fd 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.record;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.List;
@@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class RecordingMetaDeltaDao {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDeltaDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDeltaDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
index 3c2e807..780fe02 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.db.dao.room;
import static org.apache.openmeetings.util.CalendarHelper.getZoneId;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class InvitationDao {
- private static final Logger log = Red5LoggerFactory.getLogger(InvitationDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InvitationDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
index 903e9b1..24f0597 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.db.dao.room;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.Date;
import java.util.List;
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
@Repository
@Transactional
public class PollDao {
- private static final Logger log = Red5LoggerFactory.getLogger(PollDao.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(PollDao.class, getWebAppRootKey());
@PersistenceContext
private EntityManager em;