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:54 UTC
[1/4] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
Repository: openmeetings
Updated Branches:
refs/heads/master f86904557 -> 76abbfa78
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
index bec8307..3dcff6b 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
@@ -22,7 +22,7 @@ import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION;
import static org.apache.openmeetings.db.dto.basic.ServiceResult.UNKNOWN;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
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 static org.apache.openmeetings.webservice.Constants.TNS;
import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_NAME;
import static org.apache.openmeetings.webservice.Constants.USER_SERVICE_PORT_NAME;
@@ -45,7 +45,6 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
-import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.util.StrongPasswordValidator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
@@ -64,9 +63,7 @@ import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.user.UserManager;
import org.apache.openmeetings.util.OmException;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.webservice.error.ServiceException;
-import org.apache.wicket.Application;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.IValidationError;
import org.apache.wicket.validation.IValidator;
@@ -90,7 +87,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/user")
public class UserWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, getWebAppRootKey());
/**
* @param user - login or email of Openmeetings user with admin or SOAP-rights
@@ -417,8 +414,7 @@ public class UserWebService extends BaseWebService {
@Path("/count/{roomid}")
public ServiceResult count(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="roomid") @PathParam("roomid") Long roomId) {
if (AuthLevelUtil.hasUserLevel(getRights(sid))) {
- IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName);
- return new ServiceResult("" + app.getOmRoomClients(roomId).size(), Type.SUCCESS);
+ return new ServiceResult(String.valueOf(getApp().getOmRoomClients(roomId).size()), Type.SUCCESS);
}
return NO_PERMISSION;
}
[3/4] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
Posted by so...@apache.org.
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);
}
[4/4] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
Posted by so...@apache.org.
[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;
[2/4] openmeetings git commit: [OPENMEETINGS-1714] more issues are
fixed
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index e936cad..27be7d8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOAR
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_RSS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MYROOMS_ENABLED;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getDashboardContext;
@@ -91,7 +91,7 @@ import org.wicketstuff.dashboard.web.DashboardContext;
public class WebSession extends AbstractAuthenticatedWebSession implements IWebSession {
private static final long serialVersionUID = 1L;
- private static final Logger log = getLogger(WebSession.class, webAppRootKey);
+ private static final Logger log = getLogger(WebSession.class, getWebAppRootKey());
public static final int MILLIS_IN_MINUTE = 60000;
public static final List<String> AVAILABLE_TIMEZONES = Arrays.asList(TimeZone.getAvailableIDs());
public static final Set<String> AVAILABLE_TIMEZONE_SET = new LinkedHashSet<>(AVAILABLE_TIMEZONES);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java
index d2a405c..2fad7a4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.common;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class ErrorMessagePanel extends Panel {
- private static final Logger log = Red5LoggerFactory.getLogger(ErrorMessagePanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ErrorMessagePanel.class, getWebAppRootKey());
private static final long serialVersionUID = 1L;
public ErrorMessagePanel(String id, String msg, Throwable err) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index e181997..247b52c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.common;
import static org.apache.openmeetings.util.CalendarHelper.getDate;
-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.Application.getInvitationLink;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
@@ -68,7 +68,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public abstract class InvitationForm extends Form<Invitation> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(InvitationForm.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InvitationForm.class, getWebAppRootKey());
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final PasswordTextField passwd;
private final DropDownChoice<String> timeZoneId = new DropDownChoice<>("timeZoneId", Model.of((String)null), AVAILABLE_TIMEZONES);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index e86a2ea..c727a34 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.common;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MYROOMS_ENABLED;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.addOnlineUser;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
@@ -95,7 +95,7 @@ import com.googlecode.wicket.jquery.ui.widget.menu.IMenuItem;
public class MainPanel extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(MainPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(MainPanel.class, getWebAppRootKey());
private static final String DELIMITER = " ";
private final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID);
public static final String PARAM_USER_ID = "userId";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index ebeaca5..5bc94f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.common;
-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 java.io.File;
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
public abstract class UploadableImagePanel extends ImagePanel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(UploadableImagePanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UploadableImagePanel.class, getWebAppRootKey());
private final FileUploadField fileUploadField = new FileUploadField("image", new IModel<List<FileUpload>>() {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
index 915fc50..e7431c5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.java
@@ -18,7 +18,8 @@
*/
package org.apache.openmeetings.web.pages;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.isInitComplete;
+
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.RestartResponseException;
@@ -26,7 +27,7 @@ public class NotInitedPage extends BaseNotInitedPage {
private static final long serialVersionUID = 1L;
public NotInitedPage() {
- if (OpenmeetingsVariables.initComplete) {
+ if (isInitComplete()) {
continueToOriginalDestination();
// Ups, no original destination. Go to the home page
throw new RestartResponseException(Application.get().getHomePage());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index d091bc5..255ca49 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages.auth;
-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 java.util.Arrays;
@@ -62,7 +62,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
- private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, getWebAppRootKey());
private static final long serialVersionUID = 1L;
private final DialogButton send = new DialogButton("send", Application.getString("317"));
private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index c1d4dc4..e43e78d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -22,7 +22,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_DEFAULT_GROUP_ID;
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.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.wicket.validation.validator.StringValidator.minimumLength;
@@ -66,7 +66,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class RegisterDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RegisterDialog.class, getWebAppRootKey());
private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("lbl.cancel"));
private DialogButton registerBtn = new DialogButton("register", Application.getString("121")) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 1381c6e..4615c77 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.pages.auth;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin;
@@ -80,7 +80,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class SignInDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(SignInDialog.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SignInDialog.class, getWebAppRootKey());
private Form<String> form;
private DialogButton loginBtn = new DialogButton("login", Application.getString("112")) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index e8f60b8..da979f3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.pages.auth;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_IGNORE_BAD_SSL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
-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 java.io.DataOutputStream;
@@ -73,7 +73,7 @@ import com.github.openjson.JSONObject;
public class SignInPage extends BaseInitedPage {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(SignInPage.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SignInPage.class, getWebAppRootKey());
private SignInDialog d;
private KickMessageDialog m;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index 6d83427..b02042b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.pages.install;
import static org.apache.openmeetings.core.converter.BaseConverter.EXEC_EXT;
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.getWebAppRootKey;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONE_SET;
import static org.apache.wicket.validation.validator.RangeValidator.range;
@@ -98,7 +98,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class InstallWizard extends AbstractWizard<InstallationConfig> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(InstallWizard.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(InstallWizard.class, getWebAppRootKey());
private final IDynamicWizardStep welcomeStep;
private final IDynamicWizardStep dbStep;
private final ParamsStep1 paramsStep1;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
index ad70601..98631ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomBroadcaster.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.room;
-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.Application.update;
@@ -31,7 +31,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class RoomBroadcaster {
- private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomBroadcaster.class, getWebAppRootKey());
public static StreamClient getClient(String publicSid) {
return getBean(ISessionManager.class).get(publicSid);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index a6eb17c..8a42311 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.db.util.RoomHelper.videoJson;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.addUserToRoom;
import static org.apache.openmeetings.web.app.Application.exitRoom;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -109,7 +109,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
@AuthorizeInstantiation("Room")
public class RoomPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, getWebAppRootKey());
private static final String ACCESS_DENIED_ID = "access-denied";
private static final String EVENT_DETAILS_ID = "event-details";
public enum Action {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
index 076bd2f..bbbfd08 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
@@ -21,13 +21,13 @@ package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_NATIVE_SSL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_PORT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SECURE;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.ROOM_SETTINGS;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_SSL_PORT;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.net.URL;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
@@ -51,7 +51,7 @@ import com.github.openjson.JSONObject;
public class SwfPanel extends BasePanel {
private static final long serialVersionUID = 1L;
- private final static Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, webAppRootKey);
+ private final static Logger log = Red5LoggerFactory.getLogger(SwfPanel.class, getWebAppRootKey());
public static final String SWF = "swf";
public static final String SWF_TYPE_NETWORK = "network";
public static final String SWF_TYPE_SETTINGS = "settings";
@@ -123,7 +123,7 @@ public class SwfPanel extends BasePanel {
URL url = new URL(cp.getCodebase());
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) + 1);
- JSONObject gs = ROOM_SETTINGS;
+ JSONObject gs = OpenmeetingsVariables.getRoomSettings();
s.put("flashProtocol", gs.getBoolean(FLASH_SECURE) ? "rtmps" : "rtmp")
.put("flashPort", gs.getBoolean(FLASH_SECURE) ? gs.getString(FLASH_SSL_PORT) : gs.getString(FLASH_PORT))
.put("proxy", gs.getBoolean(FLASH_NATIVE_SSL) ? "best" : "none")
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
index f1a0c1f..beeeb05 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
@@ -21,8 +21,7 @@ package org.apache.openmeetings.web.room;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_PORT;
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.ROOM_SETTINGS;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.NAME_ATTR_KEY;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -35,6 +34,7 @@ import java.util.Set;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -51,7 +51,7 @@ import com.hazelcast.core.Member;
public class VideoSettings extends Panel {
private final static long serialVersionUID = 1L;
- private final static Logger log = Red5LoggerFactory.getLogger(VideoSettings.class, webAppRootKey);
+ private final static Logger log = Red5LoggerFactory.getLogger(VideoSettings.class, getWebAppRootKey());
private final static ResourceReference SETTINGS_JS_REFERENCE = new JavaScriptResourceReference(VideoSettings.class, "settings.js");
public final static String URL = "url";
public final static String FALLBACK = "fallback";
@@ -72,8 +72,8 @@ public class VideoSettings extends Panel {
public static JSONObject getInitJson(ExtendedClientProperties cp, Long roomId, String sid) {
String scope = roomId == null ? OmFileHelper.HIBERNATE : "" + roomId;
- JSONObject gs = ROOM_SETTINGS;
- JSONObject s = new JSONObject(ROOM_SETTINGS.toString())
+ JSONObject gs = OpenmeetingsVariables.getRoomSettings();
+ JSONObject s = new JSONObject(gs.toString())
.put("sid", sid)
.put("wmode", cp.isBrowserInternetExplorer() && cp.getBrowserVersionMajor() == 11 ? "opaque" : "direct");
try {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index 5c0da15..1143ff3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.room.activities;
import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
import static org.apache.openmeetings.db.dao.room.SipDao.SIP_FIRST_NAME;
import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
-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.Application.getOnlineClient;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -61,7 +61,7 @@ import org.slf4j.Logger;
public class ActivitiesPanel extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(ActivitiesPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ActivitiesPanel.class, getWebAppRootKey());
private static final String PARAM_ID = "id";
private static final String ACTION = "action";
private static final String PARAM_ROOM_ID = "roomid";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index df33c06..c76225a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.room.menu;
-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;
@@ -54,7 +54,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class RoomInvitationForm extends InvitationForm {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(RoomInvitationForm.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomInvitationForm.class, getWebAppRootKey());
private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user));
private final Long roomId;
private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index aba5107..62747b1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSH
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_FPS_SHOW;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.FLASH_NATIVE_SSL;
-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.Application.getOnlineClient;
import static org.apache.openmeetings.web.app.WebSession.getLanguage;
@@ -56,7 +56,7 @@ import com.github.openjson.JSONObject;
public class StartSharingButton extends OmButton {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(StartSharingButton.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(StartSharingButton.class, getWebAppRootKey());
private static final String CDATA_BEGIN = "<![CDATA[";
private static final String CDATA_END = "]]>";
private final AjaxDownloadBehavior download;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 2bff5c5..22d8bfd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.room.sidebar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.Application.getOnlineClient;
import static org.apache.openmeetings.web.app.Application.getRoomClients;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -74,7 +74,7 @@ import com.googlecode.wicket.kendo.ui.widget.tabs.TabListModel;
public class RoomSidebar extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(RoomSidebar.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomSidebar.class, getWebAppRootKey());
public static final String FUNC_TOGGLE_RIGHT = "toggleRight";
public static final String FUNC_TOGGLE_ACTIVITY = "toggleActivity";
public static final String FUNC_ACTION = "roomAction";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
index 1d46997..32623fd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/AbstractWbPanel.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.room.wb;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.room.wb.WbWebSocketHelper.PARAM_OBJ;
import static org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -43,7 +43,7 @@ import com.github.openjson.JSONObject;
public abstract class AbstractWbPanel extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(AbstractWbPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(AbstractWbPanel.class, getWebAppRootKey());
public static final String FUNC_ACTION = "wbAction";
public static final String PARAM_ACTION = "action";
protected static final String ROLE_NONE = "none";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 6994a22..bad7eb8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.room.wb;
import static org.apache.openmeetings.db.dto.room.Whiteboard.ITEMS_KEY;
-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.room.wb.WbWebSocketHelper.getObjWbJson;
import static org.apache.openmeetings.web.room.wb.WbWebSocketHelper.getWbJson;
@@ -93,7 +93,7 @@ import com.github.openjson.JSONTokener;
public class WbPanel extends AbstractWbPanel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(WbPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(WbPanel.class, getWebAppRootKey());
private static final int UPLOAD_WB_LEFT = 0;
private static final int UPLOAD_WB_TOP = 0;
private static final int DEFAULT_WIDTH = 640;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 7836e9a..ea7568a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.user.calendar;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_MYROOMS_ENABLED;
-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;
@@ -101,7 +101,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, getWebAppRootKey());
private AppointmentForm form;
private DialogButton save = new DialogButton("save", Application.getString("144"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 3304571..7ff247f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.user.calendar;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_FIRST_DAY;
-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.getUserId;
import static org.apache.openmeetings.web.util.CalendarWebHelper.getDate;
@@ -70,7 +70,7 @@ import com.googlecode.wicket.jquery.ui.calendar.EventSource.GoogleCalendar;
import com.googlecode.wicket.jquery.ui.form.button.Button;
public class CalendarPanel extends UserBasePanel {
- private static final Logger log = Red5LoggerFactory.getLogger(CalendarPanel.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(CalendarPanel.class, getWebAppRootKey());
private static final long serialVersionUID = 1L;
private static final String javaScriptMarkup = "setCalendarHeight();";
private final String javaScriptAddDatepicker;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index e1fdb3e..59479f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -23,7 +23,7 @@ import static org.apache.openmeetings.core.util.WebSocketHelper.ID_ROOM_PREFIX;
import static org.apache.openmeetings.core.util.WebSocketHelper.ID_USER_PREFIX;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DASHBOARD_SHOW_CHAT;
-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.Application.getUserRooms;
import static org.apache.openmeetings.web.app.Application.isUserInRoom;
@@ -77,7 +77,7 @@ import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
public class Chat extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(Chat.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(Chat.class, getWebAppRootKey());
private static final String PARAM_MSG_ID = "msgid";
private static final String PARAM_ROOM_ID = "roomid";
private static final String PARAM_TYPE = "type";
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index 5a0bb35..4508493 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.user.profile;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
-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.getUserId;
@@ -45,7 +45,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ChangePasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(ChangePasswordDialog.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ChangePasswordDialog.class, getWebAppRootKey());
private final DialogButton update = new DialogButton("update", Model.of(Application.getString("327"))) {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
index 5aa8251..9f4f9cc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
-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.getUserId;
@@ -47,7 +47,7 @@ import com.googlecode.wicket.jquery.ui.form.button.ButtonBehavior;
public class ProfileForm extends Form<User> {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(ProfileForm.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ProfileForm.class, getWebAppRootKey());
private final PasswordTextField passwd = new PasswordTextField("passwd", new Model<String>());
private final GeneralUserForm userForm;
private final ChangePasswordDialog chPwdDlg;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
index 03773a7..7577c58 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/FileItemResourceReference.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.util;
-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.io.File;
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
public abstract class FileItemResourceReference<T extends BaseFileItem> extends FileSystemResourceReference {
private static final long serialVersionUID = 1L;
- protected static final Logger log = getLogger(FileItemResourceReference.class, webAppRootKey);
+ protected static final Logger log = getLogger(FileItemResourceReference.class, getWebAppRootKey());
public FileItemResourceReference(String name) {
super(name);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
index 051db0d..9826041 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.web.util;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasAdminLevel;
import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getGroupLogo;
-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;
@@ -44,7 +44,7 @@ import org.slf4j.Logger;
public class GroupLogoResourceReference extends FileSystemResourceReference {
private static final long serialVersionUID = 1L;
- private static final Logger log = getLogger(GroupLogoResourceReference.class, webAppRootKey);
+ private static final Logger log = getLogger(GroupLogoResourceReference.class, getWebAppRootKey());
public GroupLogoResourceReference() {
super(GroupLogoResourceReference.class, "grouplogo");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
index 871cc12..bfa9a4d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ProfileImageResourceReference.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.util;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.SIP_USER_ID;
-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 java.io.File;
@@ -45,7 +45,7 @@ import org.slf4j.Logger;
public class ProfileImageResourceReference extends ResourceReference {
private static final long serialVersionUID = 1L;
- private static final Logger log = Red5LoggerFactory.getLogger(ProfileImageResourceReference.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ProfileImageResourceReference.class, getWebAppRootKey());
public ProfileImageResourceReference() {
super(ProfileImageResourceReference.class, "profile");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
index d7dbfc9..10ee875 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserDashboardPersister.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.util;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OmFileHelper.getUserDashboard;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.red5.logging.Red5LoggerFactory.getLogger;
@@ -40,7 +40,7 @@ import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
public class UserDashboardPersister implements DashboardPersister {
- private static final Logger log = getLogger(UserDashboardPersister.class, webAppRootKey);
+ private static final Logger log = getLogger(UserDashboardPersister.class, getWebAppRootKey());
@Override
public Dashboard load() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
index ada7985..a0f2120 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.test;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.configKeyCryptClassName;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getConfigKeyCryptClassName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setWicketApplicationName;
import static org.junit.Assert.assertNotNull;
import java.util.Date;
@@ -60,7 +60,7 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
@Before
public void setUp() throws Exception {
- wicketApplicationName = "openmeetings";
+ setWicketApplicationName("openmeetings");
cfgDao.getCryptKey();
if (userDao.count() < 1) {
makeDefaultScheme();
@@ -68,7 +68,7 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest {
} else {
log.info("Default scheme already created");
}
- if (configKeyCryptClassName == null) {
+ if (getConfigKeyCryptClassName() == null) {
assertNotNull("Crypt class name should not be null", cfgDao.getCryptKey());
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
index b2d3a33..f82ff95 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.backup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -44,7 +44,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestOldBackups extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestOldBackups.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestOldBackups.class, getWebAppRootKey());
@Autowired
private BackupImport backupController;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
index 612aac4..b1cee5b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -47,7 +47,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestAppointmentAddAppointment extends AbstractWicketTester {
- private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentAddAppointment.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentAddAppointment.class, getWebAppRootKey());
@Autowired
private AppointmentLogic appointmentLogic;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
index 39e497c..887ff90 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertTrue;
import org.apache.openmeetings.service.calendar.AppointmentLogic;
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestAppointmentSchedulerTask.class, getWebAppRootKey());
@Autowired
private AppointmentLogic appointmentLogic;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
index 6d75f0a..84a2cf8 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointment.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureAppointment.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureAppointment.class, getWebAppRootKey());
@Autowired
private AppointmentDao appointmentDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
index ac5046c..e20cd3f 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetAppointmentByRange.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class, getWebAppRootKey());
@Autowired
private AppointmentDao appointmentDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
index 193aa4b..8be42f2 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureGetUserStart.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class, getWebAppRootKey());
@Autowired
private UserDao userDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
index b32e7a3..c928ac1 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestDatabaseStructureUsersSearch.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestDatabaseStructureUsersSearch extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureUsersSearch.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureUsersSearch.class, getWebAppRootKey());
@Autowired
private UserDao userDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
index 7bc1bf8..2df1894 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestGetAppointment.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestGetAppointment extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestGetAppointment.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestGetAppointment.class, getWebAppRootKey());
@Autowired
private AppointmentDao appointmentDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
index 91b1827..45cd2ce 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.calendar;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -68,7 +68,7 @@ import net.fortuna.ical4j.model.property.Uid;
import net.fortuna.ical4j.model.property.Version;
public class TestSendIcalMessage extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestSendIcalMessage.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestSendIcalMessage.class, getWebAppRootKey());
@Autowired
private MailHandler mailHandler;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
index 3ac197f..3b98927 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/config/TestConfig.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.test.config;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_SERVER;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestConfig extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestConfig.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestConfig.class, getWebAppRootKey());
@Autowired
private ConfigurationDao configurationDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
index 088949e..6e02765 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/derby/PrepareSystemFiles.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.derby;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
*
*/
public class PrepareSystemFiles {
- private static final Logger log = Red5LoggerFactory.getLogger(PrepareSystemFiles.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(PrepareSystemFiles.class, getWebAppRootKey());
public static void main(String... args) {
try {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
index 379145b..fc90b9b 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestAddGroup.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.domain;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertNotNull;
import org.apache.openmeetings.db.dao.user.GroupDao;
@@ -33,7 +33,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestAddGroup extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestAddGroup.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestAddGroup.class, getWebAppRootKey());
@Autowired
private GroupDao groupDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
index 0723451..3152eba 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/domain/TestUserGroupAggregation.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.domain;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestUserGroupAggregation extends AbstractJUnitDefaults {
- private static final Logger log = Red5LoggerFactory.getLogger(TestUserGroupAggregation.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestUserGroupAggregation.class, getWebAppRootKey());
@Autowired
private UserDao userDao;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
index 54f9867..1344fa1 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/selenium/SeleniumUtils.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.selenium;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.File;
import java.text.DateFormat;
@@ -36,7 +36,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class SeleniumUtils {
- private static final Logger log = Red5LoggerFactory.getLogger(SeleniumUtils.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(SeleniumUtils.class, getWebAppRootKey());
// we need to retry some actions because our web site is dynamic
static int numberOfRetries = 10;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/BaseWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/BaseWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/BaseWebService.java
index 616d309..efae6aa 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/BaseWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/BaseWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWicketApplicationName;
import java.util.Set;
@@ -32,9 +32,12 @@ import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.wicket.Application;
public abstract class BaseWebService {
+ static IApplication getApp() {
+ return (IApplication)Application.get(getWicketApplicationName());
+ }
+
static <T> T getBean(Class<T> clazz) {
- IApplication iapp = (IApplication)Application.get(wicketApplicationName);
- return iapp._getOmBean(clazz);
+ return getApp()._getOmBean(clazz);
}
static SessiondataDao getSessionDao() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
index ef7f93d..5d0ea30 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION;
@@ -68,7 +68,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/calendar")
public class CalendarWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(CalendarWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(CalendarWebService.class, getWebAppRootKey());
private static AppointmentDao getDao() {
return getBean(AppointmentDao.class);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
index b58ad4e..6dc3ca3 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ErrorWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import javax.jws.WebMethod;
@@ -54,7 +54,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/error")
public class ErrorWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(ErrorWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ErrorWebService.class, getWebAppRootKey());
/**
* loads an Error-Object. If a Method returns a negative Result, its an
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
index 157e904..470a0cc 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.webservice;
import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import java.io.InputStream;
@@ -72,7 +72,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/file")
public class FileWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(FileWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileWebService.class, getWebAppRootKey());
/**
* deletes files or folders based on it id
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index 3a6dbfb..ac64d10 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.webservice;
import static org.apache.commons.lang3.StringUtils.isAlphanumeric;
import static org.apache.openmeetings.db.dto.basic.ServiceResult.NO_PERMISSION;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import java.util.ArrayList;
@@ -74,7 +74,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/group")
public class GroupWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(GroupWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(GroupWebService.class, getWebAppRootKey());
private static GroupDao getDao() {
return getBean(GroupDao.class);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 1ec4e8b..c92a01a 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -43,7 +43,7 @@ import org.springframework.stereotype.Service;
@Service("netTestWebService")
@Path("/networktest")
public class NetTestWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, getWebAppRootKey());
enum TestType {
UNKNOWN,
PING,
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
index aea9735..e047968 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RecordingWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import java.util.List;
@@ -58,7 +58,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/record")
public class RecordingWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(RecordingWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RecordingWebService.class, getWebAppRootKey());
private static RecordingDao getDao() {
return getBean(RecordingDao.class);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/76abbfa7/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
----------------------------------------------------------------------
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index 25c3914..1906785 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.webservice;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
import static org.apache.openmeetings.webservice.Constants.TNS;
import static org.apache.openmeetings.webservice.error.ServiceException.NO_PERMISSION;
@@ -58,10 +58,8 @@ import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.room.InvitationManager;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.message.RoomMessage;
import org.apache.openmeetings.webservice.error.ServiceException;
-import org.apache.wicket.Application;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.stereotype.Service;
@@ -78,7 +76,7 @@ import org.springframework.stereotype.Service;
@Produces({MediaType.APPLICATION_JSON})
@Path("/room")
public class RoomWebService extends BaseWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(RoomWebService.class, webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RoomWebService.class, getWebAppRootKey());
/**
* Returns an Object of Type RoomsList which contains a list of
@@ -439,7 +437,7 @@ public class RoomWebService extends BaseWebService {
List<RoomCountDTO> roomBeans = new ArrayList<>();
try {
if (AuthLevelUtil.hasWebServiceLevel(getRights(sid))) {
- IApplication app = (IApplication)Application.get(OpenmeetingsVariables.wicketApplicationName);
+ IApplication app = getApp();
List<Room> rooms = getRoomDao().get(ids);
for (Room room : rooms) {