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) {
