http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java index e232fd9..175a1c3 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.room; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ROOM_PREFIX; import static org.apache.openmeetings.util.OpenmeetingsVariables.RECENT_ROOMS_COUNT; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.Calendar; @@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class RoomDao implements IGroupAdminDataProviderDao<Room> { - private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(RoomDao.class, getWebAppRootKey()); public final static String[] searchFields = {"name"}; @PersistenceContext
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java index 5ee87df..e71db60 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dao.server; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.Date; @@ -49,7 +49,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class LdapConfigDao implements IDataProviderDao<LdapConfig> { - private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigDao.class, getWebAppRootKey()); public final static String[] searchFields = {"name", "configFileName", "domain", "comment"}; @PersistenceContext http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java index 61b3b83..abae7f0 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SOAPLoginDao.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dao.server; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Date; import java.util.List; @@ -36,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class SOAPLoginDao { - private static final Logger log = Red5LoggerFactory.getLogger(SOAPLoginDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(SOAPLoginDao.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/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index dea7683..00a22fc 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dao.server; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.Date; @@ -45,7 +45,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class SessiondataDao { - private static final Logger log = Red5LoggerFactory.getLogger(SessiondataDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(SessiondataDao.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/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index 4af7756..2217261 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.db.dao.user; import static org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Collection; import java.util.Date; @@ -43,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { - private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageDao.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/user/PrivateMessageFolderDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java index 2afb284..209753f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dao.user; -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 PrivateMessageFolderDao implements IDataProviderDao<PrivateMessageFolder> { - private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageFolderDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageFolderDao.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/user/UserContactDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java index 5de373a..cf293c1 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dao.user; -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 UserContactDao { - private static final Logger log = Red5LoggerFactory.getLogger(UserContactDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(UserContactDao.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/user/UserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java index a5a95ee..240bb0a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.db.dao.user; import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -75,7 +75,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional public class UserDao implements IGroupAdminDataProviderDao<User> { - private static final Logger log = Red5LoggerFactory.getLogger(UserDao.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(UserDao.class, getWebAppRootKey()); public final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java index b7b95cb..f21c04f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/Info.java @@ -18,13 +18,14 @@ */ package org.apache.openmeetings.db.dto.basic; +import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete; + import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.Version; @XmlRootElement @@ -40,7 +41,7 @@ public class Info implements Serializable { version = Version.getVersion(); revision = Version.getRevision(); buildDate = Version.getBuildDate(); - inited = OpenmeetingsVariables.initComplete; + inited = isInitComplete(); } public String getVersion() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java index 18c1693..ceaab26 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/InvitationDTO.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.dto.room; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.Serializable; import java.text.ParseException; @@ -43,7 +43,7 @@ import org.slf4j.Logger; @XmlAccessorType(XmlAccessType.FIELD) public class InvitationDTO implements Serializable { private static final long serialVersionUID = 1L; - private static final Logger log = Red5LoggerFactory.getLogger(InvitationDTO.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(InvitationDTO.class, getWebAppRootKey()); private static ThreadLocal<SimpleDateFormat> SDF = new ThreadLocal<SimpleDateFormat>() { @Override protected SimpleDateFormat initialValue() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java index fbea62c..2b62fc3 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/RemoteSessionObject.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.entity.server; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.StringReader; import java.io.StringWriter; @@ -39,7 +39,7 @@ import org.slf4j.Logger; */ @Root public class RemoteSessionObject { - private static final Logger log = Red5LoggerFactory.getLogger(RemoteSessionObject.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(RemoteSessionObject.class, getWebAppRootKey()); @Element(required = false) private String username; @Element(required = false) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java ---------------------------------------------------------------------- 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 e1bce4b..188ca42 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 @@ -18,8 +18,9 @@ */ package org.apache.openmeetings.db.util; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setInitComplete; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.red5.logging.Red5LoggerFactory.getLogger; import static org.springframework.web.context.WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE; import static org.springframework.web.context.support.WebApplicationContextUtils.getWebApplicationContext; @@ -31,7 +32,6 @@ import org.apache.openmeetings.IApplication; import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.util.OMContextListener; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.wicket.Application; import org.apache.wicket.RuntimeConfigurationType; import org.apache.wicket.ThreadContext; @@ -50,7 +50,7 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.XmlWebApplicationContext; public class ApplicationHelper { - private static final Logger log = getLogger(ApplicationHelper.class, webAppRootKey); + private static final Logger log = getLogger(ApplicationHelper.class, getWebAppRootKey()); private static final Object SYNC_OBJ = new Object(); public static WicketTester getWicketTester() { @@ -61,7 +61,7 @@ public class ApplicationHelper { WebApplication app = (WebApplication)ensureApplication(langId); WicketTester tester = new WicketTester(app, app.getServletContext()); - OpenmeetingsVariables.initComplete = true; + setInitComplete(true); return tester; } @@ -89,7 +89,7 @@ public class ApplicationHelper { if (Application.exists()) { return (IApplication)Application.get(); } - WebApplication app = (WebApplication)Application.get(wicketApplicationName); + WebApplication app = (WebApplication)Application.get(getWicketApplicationName()); LabelDao.initLanguageMap(); if (app == null) { try { @@ -99,7 +99,7 @@ public class ApplicationHelper { return null; } app.setServletContext(new MockServletContext(app, null)); - app.setName(wicketApplicationName); + app.setName(getWicketApplicationName()); ServletContext sc = app.getServletContext(); OMContextListener omcl = new OMContextListener(); omcl.contextInitialized(new ServletContextEvent(sc)); @@ -114,7 +114,7 @@ public class ApplicationHelper { } else { ThreadContext.setApplication(app); } - return (IApplication)Application.get(wicketApplicationName); + return (IApplication)Application.get(getWicketApplicationName()); } } @@ -135,7 +135,7 @@ public class ApplicationHelper { } public static void destroyApplication() { - WebApplication app = (WebApplication)Application.get(wicketApplicationName); + WebApplication app = (WebApplication)Application.get(getWicketApplicationName()); WebApplicationContext ctx = getWebApplicationContext(app.getServletContext()); app.internalDestroy(); //need to be called to if (ctx != null) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java index b72514d..4d8606f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.util; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.HashSet; import java.util.Set; @@ -33,7 +33,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class AuthLevelUtil { - private static final Logger log = Red5LoggerFactory.getLogger(AuthLevelUtil.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(AuthLevelUtil.class, getWebAppRootKey()); private static boolean check(Set<User.Right> rights, User.Right level) { boolean result = rights.contains(level); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java index 66f588f..8b8bf4d 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/LocaleHelper.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.db.util; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Arrays; import java.util.HashSet; @@ -32,7 +32,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class LocaleHelper { - private static final Logger log = Red5LoggerFactory.getLogger(LocaleHelper.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(LocaleHelper.class, getWebAppRootKey()); public static List<String> getCountries() { return Arrays.asList(Locale.getISOCountries()); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java index 87c3c06..8592faf 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.db.util; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_TIMEZONE; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.Calendar; import java.util.TimeZone; @@ -35,7 +35,7 @@ import org.springframework.stereotype.Component; @Component public class TimezoneUtil { - private static final Logger log = Red5LoggerFactory.getLogger(TimezoneUtil.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(TimezoneUtil.class, getWebAppRootKey()); @Autowired private ConfigurationDao cfgDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java index de1e114..8b716fa 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java @@ -23,7 +23,7 @@ import static org.apache.openmeetings.util.OmFileHelper.BACKUP_DIR; import static org.apache.openmeetings.util.OmFileHelper.BCKP_RECORD_FILES; import static org.apache.openmeetings.util.OmFileHelper.BCKP_ROOM_FILES; import static org.apache.openmeetings.util.OmFileHelper.IMPORT_DIR; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.ByteArrayOutputStream; import java.io.File; @@ -93,7 +93,7 @@ import org.springframework.stereotype.Component; */ @Component public class BackupExport { - private static final Logger log = Red5LoggerFactory.getLogger(BackupExport.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(BackupExport.class, getWebAppRootKey()); private static final String BACKUP_COMMENT = "###############################################\n" + "This File is auto-generated by the Backup Tool \n" http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java ---------------------------------------------------------------------- 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 8a39317..6f395d4 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 @@ -95,7 +95,7 @@ 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.getWebAppRootKey; import java.io.File; import java.io.FileInputStream; @@ -193,7 +193,7 @@ import org.xml.sax.InputSource; @Component public class BackupImport { - private static final Logger log = Red5LoggerFactory.getLogger(BackupImport.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(BackupImport.class, getWebAppRootKey()); private static final String LDAP_EXT_TYPE = "LDAP"; private static final Properties countries = new Properties(); private static final Map<String, String> outdatedConfigKeys = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java index c0ffb8b..d6551cc 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.backup; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.db.entity.record.Recording.Status; @@ -28,7 +28,7 @@ import org.simpleframework.xml.stream.OutputNode; import org.slf4j.Logger; public class RecordingStatusConverter extends OmConverter<Recording.Status> { - private static final Logger log = Red5LoggerFactory.getLogger(RecordingStatusConverter.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(RecordingStatusConverter.class, getWebAppRootKey()); private static final String PROCESSING = "PROCESSING"; public RecordingStatusConverter() {} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 7243980..1a478a5 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -23,6 +23,7 @@ import static org.apache.openmeetings.db.util.ApplicationHelper.destroyApplicati import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH; import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName; import java.io.BufferedReader; import java.io.File; @@ -63,7 +64,6 @@ import org.apache.openmeetings.util.CalendarPatterns; import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.ImportHelper; import org.apache.openmeetings.util.OmFileHelper; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.mail.MailUtil; import org.apache.wicket.util.string.StringValue; import org.apache.wicket.validation.IValidator; @@ -185,7 +185,7 @@ public class Admin { private void process(String[] args) { String ctxName = System.getProperty("context", "openmeetings"); - OpenmeetingsVariables.wicketApplicationName = ctxName; + setWicketApplicationName(ctxName); File home = new File(System.getenv("RED5_HOME")); OmFileHelper.setOmHome(new File(new File(home, "webapps"), ctxName)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index 3070f27..cdc51b8 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -85,12 +85,12 @@ 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.DEFAULT_APP_NAME; 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.HEADER_CSP_SELF; import static org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SAMEORIGIN; import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH; import static org.apache.openmeetings.util.OpenmeetingsVariables.USER_PASSWORD_MINIMUM_LENGTH; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.Date; @@ -122,7 +122,7 @@ import org.springframework.stereotype.Component; @Component public class ImportInitvalues { - private static final Logger log = Red5LoggerFactory.getLogger(ImportInitvalues.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(ImportInitvalues.class, getWebAppRootKey()); @Autowired private ConfigurationDao cfgDao; @@ -317,7 +317,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_FLASH_ECHO_PATH, "128", Configuration.Type.number, "Specifies the echo path length (in milliseconds). A longer echo path means better echo cancellation but also introduces longer delays and requires more processing power. The default value is 128; the only other possible value is 256. To disable AEC please specify 0.", "4.0.0"); addCfg(list, CONFIG_HEADER_XFRAME, HEADER_XFRAME_SAMEORIGIN, Configuration.Type.string, "Value for 'X-Frame-Options' header (default: DENY), more info: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options";, "3.3.0"); addCfg(list, CONFIG_HEADER_CSP, HEADER_CSP_SELF, Configuration.Type.string, "Value for 'Content-Security-Policy' header (default: default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval';), have to be modified to enable Google analytics site: https://content-security-policy.com/";, "3.3.0"); - addCfg(list, CONFIG_EXT_PROCESS_TTL, String.valueOf(EXT_PROCESS_TTL), Configuration.Type.number, String.format("Time to live in minutes for external processes such as conversion via ffmpeg (default %s minutes)", EXT_PROCESS_TTL), "3.3.0"); + addCfg(list, CONFIG_EXT_PROCESS_TTL, String.valueOf(getExtProcessTtl()), Configuration.Type.number, String.format("Time to live in minutes for external processes such as conversion via ffmpeg (default %s minutes)", getExtProcessTtl()), "3.3.0"); addCfg(list, CONFIG_MYROOMS_ENABLED, String.valueOf(true), Configuration.Type.bool, "Users are allowed to create personal rooms", "3.3.2"); addCfg(list, CONFIG_REMINDER_MESSAGE, null, Configuration.Type.string, "Reminder message to notify about upcoming appointment, generated message will be used if not set", "2.0.x"); return list; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java index 74a3a6d..d64cd4c 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java @@ -22,7 +22,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICAT import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES; import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_BASE_URL; import static org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MINUTES_REMINDER_SEND; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.util.ArrayList; import java.util.Calendar; @@ -51,7 +51,7 @@ import org.springframework.stereotype.Component; @Component public class AppointmentLogic { - private static final Logger log = Red5LoggerFactory.getLogger(AppointmentLogic.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(AppointmentLogic.class, getWebAppRootKey()); @Autowired private AppointmentDao appointmentDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java index aea0cf7..9c9daa6 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.service.calendar.caldav; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; import java.net.URI; @@ -67,7 +67,7 @@ import org.w3c.dom.Element; */ @Component public class AppointmentManager { - private static final Logger log = Red5LoggerFactory.getLogger(AppointmentManager.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(AppointmentManager.class, getWebAppRootKey()); //HttpClient and ConnectionManager Params private static final int IDLE_CONNECTION_TIMEOUT = 30000; // 30 seconds http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/CtagHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/CtagHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/CtagHandler.java index b69d1f4..4c3aa91 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/CtagHandler.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/CtagHandler.java @@ -37,7 +37,7 @@ import org.slf4j.Logger; import java.io.IOException; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK; /** @@ -48,7 +48,7 @@ import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK; * @see CalendarHandler */ public class CtagHandler extends AbstractCalendarHandler { - private static final Logger log = Red5LoggerFactory.getLogger(CtagHandler.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(CtagHandler.class, getWebAppRootKey()); public static final Namespace NAMESPACE_CALSERVER = Namespace.getNamespace("cs", "http://calendarserver.org/ns/";); public static final DavPropertyName DNAME_GETCTAG = DavPropertyName.create("getctag", NAMESPACE_CALSERVER); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java index e324070..9cf175f 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java @@ -22,7 +22,7 @@ import static javax.servlet.http.HttpServletResponse.SC_CREATED; import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; import java.util.ArrayList; @@ -69,7 +69,7 @@ import net.fortuna.ical4j.model.Component; * <li>Deletion of events which are not in the response.</li> */ public class EtagsHandler extends AbstractCalendarHandler { - private static final Logger log = Red5LoggerFactory.getLogger(EtagsHandler.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(EtagsHandler.class, getWebAppRootKey()); public EtagsHandler(String path, OmCalendar calendar, HttpClient client, AppointmentDao appointmentDao, iCalUtils utils) { super(path, calendar, client, appointmentDao, utils); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java index 875c0c7..c5967cc 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/MultigetHandler.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.service.calendar.caldav.handler; import static javax.servlet.http.HttpServletResponse.SC_OK; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; import java.util.List; @@ -55,7 +55,7 @@ import net.fortuna.ical4j.model.Component; * @see CalendarHandler */ public class MultigetHandler extends AbstractCalendarHandler { - private static final Logger log = Red5LoggerFactory.getLogger(MultigetHandler.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(MultigetHandler.class, getWebAppRootKey()); private CalendarMultiget query; private boolean isMultigetDisabled = false, onlyEtag = false; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/WebDAVSyncHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/WebDAVSyncHandler.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/WebDAVSyncHandler.java index 88b9325..c9bfe6c 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/WebDAVSyncHandler.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/WebDAVSyncHandler.java @@ -43,7 +43,7 @@ import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK; import static org.apache.jackrabbit.webdav.DavServletResponse.SC_FORBIDDEN; import static org.apache.jackrabbit.webdav.DavServletResponse.SC_PRECONDITION_FAILED; import static org.apache.jackrabbit.webdav.DavServletResponse.SC_NOT_FOUND; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; /** * Class used to sync events using WebDAV-Sync defined in RFC 6578. @@ -52,7 +52,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; * modified or deleted. */ public class WebDAVSyncHandler extends AbstractCalendarHandler { - private static final Logger log = Red5LoggerFactory.getLogger(WebDAVSyncHandler.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(WebDAVSyncHandler.class, getWebAppRootKey()); public static final DavPropertyName DNAME_SYNCTOKEN = DavPropertyName.create(SyncReportInfo.XML_SYNC_TOKEN, SyncReportInfo.NAMESPACE); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java index 0583e5b..071bd40 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.service.calendar.caldav; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.net.URI; import java.text.ParsePosition; @@ -75,7 +75,7 @@ import net.fortuna.ical4j.model.property.Version; */ @org.springframework.stereotype.Component public class iCalUtils { - private static final Logger log = Red5LoggerFactory.getLogger(iCalUtils.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(iCalUtils.class, getWebAppRootKey()); public static final String PROD_ID = "-//Events Calendar//Apache Openmeetings//EN"; @Autowired http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java index 0fc17a8..2a92fc6 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/methods/SyncMethod.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.service.calendar.caldav.methods; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; @@ -43,7 +43,7 @@ import org.w3c.dom.Document; * @see SyncReportInfo for Request Report to be given as argument */ public class SyncMethod extends DavMethodBase { - private static final Logger log = Red5LoggerFactory.getLogger(ReportMethod.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(ReportMethod.class, getWebAppRootKey()); private MultiStatus multiStatus = null; private String synctoken = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java index cd52067..47ae46c 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java @@ -21,8 +21,8 @@ package org.apache.openmeetings.service.mail; import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.core.mail.MailHandler; @@ -42,15 +42,19 @@ import org.springframework.stereotype.Component; */ @Component public class EmailManager { - private static final Logger log = Red5LoggerFactory.getLogger(EmailManager.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(EmailManager.class, getWebAppRootKey()); @Autowired private ConfigurationDao cfgDao; @Autowired private MailHandler mailHandler; + private static IApplication getApp() { + return ((IApplication)Application.get(getWicketApplicationName())); + } + public static String getString(String key) { - return ((IApplication)Application.get(wicketApplicationName)).getOmString(key); + return getApp().getOmString(key); } /** @@ -68,7 +72,7 @@ public class EmailManager { boolean sendEmailAtRegister = cfgDao.getBool(CONFIG_EMAIL_AT_REGISTER, false); ensureApplication(langId != null ? langId : cfgDao.getLong(CONFIG_DEFAULT_LANG, 1L)); - String link = ((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new PageParameters().add("u", hash)); + String link = getApp().urlForActivatePage(new PageParameters().add("u", hash)); if (sendEmailAtRegister) { mailHandler.send(email, getString("512") http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java index 35f2df0..56b8689 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.service.notifier; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REMINDER_MESSAGE; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import javax.annotation.PostConstruct; @@ -39,7 +39,7 @@ import org.springframework.stereotype.Component; @Component public class TextNotifier implements INotifier { - private static final Logger log = Red5LoggerFactory.getLogger(TextNotifier.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(TextNotifier.class, getWebAppRootKey()); @Autowired private NotifierService notifier; @Autowired http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java index 8cd46eb..49742ec 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/AbstractJob.java @@ -18,7 +18,8 @@ */ package org.apache.openmeetings.service.quartz.scheduler; -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.time.Instant; import java.time.temporal.ChronoUnit; @@ -28,20 +29,19 @@ import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.db.entity.user.Group; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public abstract class AbstractJob { - private static Logger log = Red5LoggerFactory.getLogger(AbstractJob.class, webAppRootKey); + private static Logger log = Red5LoggerFactory.getLogger(AbstractJob.class, getWebAppRootKey()); @Autowired private GroupDao groupDao; @Autowired RecordingDao recordingDao; void processExpiringRecordings(boolean notified, BiConsumer<Recording, Long> consumer) { - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } for (Group g : groupDao.getLimited()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java index 816ddc6..8426db6 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java @@ -21,7 +21,8 @@ package org.apache.openmeetings.service.quartz.scheduler; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.TEST_SETUP_PREFIX; import static org.apache.openmeetings.util.OmFileHelper.getStreamsDir; -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.File; import java.io.FileFilter; @@ -37,13 +38,12 @@ import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.room.Whiteboard; import org.apache.openmeetings.db.dto.room.Whiteboards; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; public class CleanupJob extends AbstractJob { - private static Logger log = Red5LoggerFactory.getLogger(CleanupJob.class, webAppRootKey); + private static Logger log = Red5LoggerFactory.getLogger(CleanupJob.class, getWebAppRootKey()); private long sessionTimeout = 30 * 60 * 1000L; private long testSetupTimeout = 60 * 60 * 1000L; // 1 hour private long roomFilesTtl = 60 * 60 * 1000L; // 1 hour @@ -74,7 +74,7 @@ public class CleanupJob extends AbstractJob { public void cleanTestSetup() { log.debug("CleanupJob.cleanTestSetup"); - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } try { @@ -107,7 +107,7 @@ public class CleanupJob extends AbstractJob { public void cleanRoomFiles() { log.debug("CleanupJob.cleanRoomFiles"); - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } try { @@ -148,7 +148,7 @@ public class CleanupJob extends AbstractJob { public void cleanSessions() { log.trace("CleanupJob.cleanSessions"); - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } try { @@ -175,7 +175,7 @@ public class CleanupJob extends AbstractJob { public void cleanExpiredResetHash() { log.debug("CleanupJob.cleanExpiredResetHash"); - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } List<User> users = userDao.getByExpiredHash(resetHashTtl); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java index 854284a..553c976 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java @@ -18,7 +18,8 @@ */ package org.apache.openmeetings.service.quartz.scheduler; -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 org.apache.openmeetings.core.mail.MailHandler; import org.apache.openmeetings.db.dao.user.UserDao; @@ -26,7 +27,6 @@ import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.service.calendar.AppointmentLogic; import org.apache.openmeetings.service.mail.template.subject.AbstractSubjectEmailTemplate; import org.apache.openmeetings.service.mail.template.subject.RecordingExpiringTemplate; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -34,7 +34,7 @@ import org.springframework.stereotype.Component; @Component("reminderJob") public class ReminderJob extends AbstractJob { - private static Logger log = Red5LoggerFactory.getLogger(ReminderJob.class, webAppRootKey); + private static Logger log = Red5LoggerFactory.getLogger(ReminderJob.class, getWebAppRootKey()); @Autowired private AppointmentLogic appointmentLogic; @Autowired @@ -44,7 +44,7 @@ public class ReminderJob extends AbstractJob { public void remindMeetings() { log.debug("ReminderJob.remindMeetings"); - if (!OpenmeetingsVariables.initComplete) { + if (!isInitComplete()) { return; } try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java index 9120324..14bfa2a 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.service.room; 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.util.ArrayList; import java.util.Date; @@ -63,7 +63,7 @@ import org.springframework.stereotype.Component; */ @Component public class InvitationManager implements IInvitationManager { - private static final Logger log = Red5LoggerFactory.getLogger(InvitationManager.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(InvitationManager.class, getWebAppRootKey()); @Autowired private InvitationDao invitationDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index 3a7adbc..e8f9542 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -25,7 +25,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_VERIFICATION; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -72,7 +72,7 @@ import org.springframework.stereotype.Component; */ @Component public class UserManager implements IUserManager { - private static final Logger log = Red5LoggerFactory.getLogger(UserManager.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(UserManager.class, getWebAppRootKey()); @Autowired private SessiondataDao sessionDao; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java index 152a72d..d027c7e 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.util; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.text.ParseException; import java.util.Date; @@ -33,7 +33,7 @@ import org.slf4j.Logger; * */ public class CalendarPatterns { - private static final Logger log = Red5LoggerFactory.getLogger(CalendarPatterns.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(CalendarPatterns.class, getWebAppRootKey()); public static final FastDateFormat dateFormat__ddMMyyyyHHmmss = FastDateFormat.getInstance("dd.MM.yyyy HH:mm:ss"); public static final FastDateFormat dateFormat__ddMMyyyy = FastDateFormat.getInstance("dd.MM.yyyy"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java index 71015d1..170a62b 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java @@ -18,6 +18,9 @@ */ package org.apache.openmeetings.util; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setWebAppRootKey; + import javax.servlet.ServletContextEvent; import org.red5.logging.ContextLoggingListener; @@ -31,9 +34,9 @@ public class OMContextListener extends ContextLoggingListener { @Override public void contextInitialized(ServletContextEvent event) { - OpenmeetingsVariables.webAppRootKey = pathToName(event); - System.setProperty("current_openmeetings_context_name", OpenmeetingsVariables.webAppRootKey); - System.setProperty("webapp.contextPath", String.format("/%s", OpenmeetingsVariables.webAppRootKey)); + setWebAppRootKey(pathToName(event)); + System.setProperty("current_openmeetings_context_name", getWebAppRootKey()); + System.setProperty("webapp.contextPath", String.format("/%s", getWebAppRootKey())); System.setProperty("logback.configurationFile", "logback-config.xml"); super.contextInitialized(event); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index c910cec..d2e9650 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -108,19 +108,67 @@ public class OpenmeetingsVariables { public static final int DEFAULT_MINUTES_REMINDER_SEND = 15; public static final String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";; - public static String webAppRootKey = null; - public static String configKeyCryptClassName = null; - public static String wicketApplicationName = null; + private static String webAppRootKey = null; + private static String configKeyCryptClassName = null; + private static String wicketApplicationName = null; private static String applicationName = null; - public static int EXT_PROCESS_TTL = 20; - public static JSONObject ROOM_SETTINGS = new JSONObject(); - public static boolean initComplete = false; + private static int extProcessTtl = 20; + private static JSONObject roomSettings = new JSONObject(); + private static boolean initComplete = false; public static String getApplicationName() { return applicationName; } - public static void setApplicationName(String applicationName) { - OpenmeetingsVariables.applicationName = applicationName; + public static void setApplicationName(String name) { + applicationName = name; + } + + public static JSONObject getRoomSettings() { + return new JSONObject(roomSettings.toString()); + } + + public static void setRoomSettings(JSONObject s) { + roomSettings = s; + } + + public static String getConfigKeyCryptClassName() { + return configKeyCryptClassName; + } + + public static void setConfigKeyCryptClassName(String name) { + configKeyCryptClassName = name; + } + + public static int getExtProcessTtl() { + return extProcessTtl; + } + + public static void setExtProcessTtl(int ttl) { + extProcessTtl = ttl; + } + + public static boolean isInitComplete() { + return initComplete; + } + + public static void setInitComplete(boolean complete) { + initComplete = complete; + } + + public static String getWicketApplicationName() { + return wicketApplicationName; + } + + public static void setWicketApplicationName(String name) { + wicketApplicationName = name; + } + + public static String getWebAppRootKey() { + return webAppRootKey; + } + + public static void setWebAppRootKey(String key) { + webAppRootKey = key; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java index f38e29e..57d1351 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/StoredFile.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.util; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; 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 static org.apache.tika.metadata.TikaMetadataKeys.RESOURCE_NAME_KEY; import static org.apache.tika.mime.MediaType.application; @@ -42,7 +42,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class StoredFile { - private static final Logger log = Red5LoggerFactory.getLogger(StoredFile.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(StoredFile.class, getWebAppRootKey()); private final static String MIME_AUDIO = "audio"; private final static String MIME_VIDEO = "video"; private final static String MIME_IMAGE = "image"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java index 2aeb421..1ec3289 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/Version.java @@ -26,7 +26,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class Version { - private static final Logger log = Red5LoggerFactory.getLogger(Version.class, OpenmeetingsVariables.webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(Version.class, OpenmeetingsVariables.getWebAppRootKey()); private static final int startedStringLength = 78; private static String version = null; private static String revision = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java index b601158..2833354 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/CryptProvider.java @@ -18,24 +18,25 @@ */ package org.apache.openmeetings.util.crypt; -import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getConfigKeyCryptClassName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class CryptProvider { - private static final Logger log = Red5LoggerFactory.getLogger(CryptProvider.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(CryptProvider.class, getWebAppRootKey()); private static volatile ICrypt crypt; public static ICrypt get() { if (crypt == null) { synchronized (CryptProvider.class) { if (crypt == null) { + String clazz = getConfigKeyCryptClassName(); try { - log.debug("getInstanceOfCrypt:: configKeyCryptClassName: " + configKeyCryptClassName); + log.debug("getInstanceOfCrypt:: configKeyCryptClassName: {}", clazz); - crypt = configKeyCryptClassName == null ? null : (ICrypt) Class.forName(configKeyCryptClassName).newInstance(); + crypt = clazz == null ? null : (ICrypt) Class.forName(clazz).newInstance(); } catch (Exception err) { log.error("[getInstanceOfCrypt]", err); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java index 1ed2db7..5705e5d 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/MD5Implementation.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.util.crypt; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.security.NoSuchAlgorithmException; @@ -30,7 +30,7 @@ import org.slf4j.Logger; * passwords created using OM earlier than 3.1.0 */ class MD5Implementation { - private static final Logger log = Red5LoggerFactory.getLogger(MD5Implementation.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(MD5Implementation.class, getWebAppRootKey()); private static String hash(String str) { String passPhrase = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java index 0aa8072..94dec75 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.util.crypt; 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.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -30,7 +30,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class SCryptImplementation implements ICrypt { - private static final Logger log = Red5LoggerFactory.getLogger(SCryptImplementation.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(SCryptImplementation.class, getWebAppRootKey()); private static final String SECURE_RND_ALG = "SHA1PRNG"; private static final int COST = 1024 * 16; private static final int KEY_LENGTH = 512; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java index 84b5a35..c0d0aa6 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.util.mail; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; @@ -60,7 +60,7 @@ import net.fortuna.ical4j.model.property.Version; * */ public class IcalHandler { - private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, getWebAppRootKey()); static { System.setProperty("net.fortuna.ical4j.timezone.update.enabled", "false"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java index 6c94357..eda92e0 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ConverterProcessResultList.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.util.process; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.red5.logging.Red5LoggerFactory.getLogger; import java.util.LinkedHashMap; @@ -35,7 +35,7 @@ import org.slf4j.Logger; * */ public class ConverterProcessResultList { - private static final Logger log = getLogger(ConverterProcessResultList.class, webAppRootKey); + private static final Logger log = getLogger(ConverterProcessResultList.class, getWebAppRootKey()); private Map<String, ConverterProcessResult> jobs = new LinkedHashMap<>(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java index 9fc76fe..1e49c36 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.util.process; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.openmeetings.util.OpenmeetingsVariables.EXT_PROCESS_TTL; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl; import java.util.HashMap; import java.util.Map; @@ -31,7 +31,7 @@ import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; public class ProcessHelper { - public static final Logger log = Red5LoggerFactory.getLogger(ProcessHelper.class, OpenmeetingsVariables.webAppRootKey); + public static final Logger log = Red5LoggerFactory.getLogger(ProcessHelper.class, OpenmeetingsVariables.getWebAppRootKey()); public static ConverterProcessResult executeScriptWindows(String process, String[] argv) { try { @@ -94,7 +94,7 @@ public class ProcessHelper { // 20-minute timeout for command execution // FFMPEG conversion of Recordings may take a real long time until // its finished - proc.waitFor(EXT_PROCESS_TTL, TimeUnit.MINUTES); + proc.waitFor(getExtProcessTtl(), TimeUnit.MINUTES); res.setExitCode(proc.exitValue()); res.setOut(IOUtils.toString(proc.getInputStream(), UTF_8)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java index 4b9e0c3..69df249 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.web.admin.backup; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.wicket.util.time.Duration.NONE; @@ -65,7 +65,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; * */ public class BackupPanel extends AdminBasePanel { - private static final Logger log = Red5LoggerFactory.getLogger(BackupPanel.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(BackupPanel.class, getWebAppRootKey()); private static final long serialVersionUID = 1L; private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java index f41afaa..9690a71 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java @@ -18,7 +18,7 @@ */ package org.apache.openmeetings.web.admin.labels; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import java.io.IOException; import java.io.InputStream; @@ -71,7 +71,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel; */ public class LangPanel extends AdminBasePanel { private static final long serialVersionUID = 1L; - private static final Logger log = Red5LoggerFactory.getLogger(LangPanel.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(LangPanel.class, getWebAppRootKey()); private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); private final LangForm langForm; private FileUploadField fileUploadField; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index 44ca452..eaa7ba8 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -23,7 +23,7 @@ import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength; import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EMAIL_AT_REGISTER; import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN; -import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.app.Application.getBean; import static org.apache.openmeetings.web.app.WebSession.getRights; import static org.apache.openmeetings.web.app.WebSession.getUserId; @@ -85,7 +85,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; */ public class UserForm extends AdminBaseForm<User> { private static final long serialVersionUID = 1L; - private static final Logger log = Red5LoggerFactory.getLogger(UserForm.class, webAppRootKey); + private static final Logger log = Red5LoggerFactory.getLogger(UserForm.class, getWebAppRootKey()); private final WebMarkupContainer listContainer; private final WebMarkupContainer domain = new WebMarkupContainer("domain"); private GeneralUserForm generalForm; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 5f6c0e6..02c2b69 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -23,8 +23,10 @@ import static org.apache.openmeetings.db.dao.room.SipDao.SIP_FIRST_NAME; import static org.apache.openmeetings.db.dao.room.SipDao.SIP_USER_NAME; import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID; 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.getWicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete; +import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName; +import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH; import static org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment; import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES; @@ -145,7 +147,7 @@ import com.hazelcast.core.Message; import com.hazelcast.core.MessageListener; public class Application extends AuthenticatedWebApplication implements IApplication { - private static final Logger log = getLogger(Application.class, webAppRootKey); + private static final Logger log = getLogger(Application.class, getWebAppRootKey()); private static boolean isInstalled; private final static String ONLINE_USERS_KEY = "ONLINE_USERS_KEY"; private final static String UID_BY_SID_KEY = "UID_BY_SID_KEY"; @@ -172,7 +174,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica @Override protected void init() { - wicketApplicationName = super.getName(); + setWicketApplicationName(super.getName()); getSecuritySettings().setAuthenticationStrategy(new OmAuthenticationStrategy()); getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class); @@ -339,7 +341,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica } public static Application get() { - return (Application)org.apache.wicket.Application.get(wicketApplicationName); + return (Application)org.apache.wicket.Application.get(getWicketApplicationName()); } public static DashboardContext getDashboardContext() { @@ -741,7 +743,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static boolean isInstalled() { boolean result = isInstalled; if (!isInstalled) { - if (OpenmeetingsVariables.initComplete) { + if (isInitComplete()) { //TODO can also check crypt class here isInstalled = result = get()._getBean(UserDao.class).count() > 0; } @@ -750,7 +752,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica } public static <T> T getBean(Class<T> clazz) { - if (OpenmeetingsVariables.initComplete) { + if (isInitComplete()) { if (!isInstalled()) { throw new RestartResponseException(InstallWizardPage.class); }
