Repository: openmeetings Updated Branches: refs/heads/master ce85e43d1 -> 63b94ad59
[OPENMEETINGS-1714] initial attempt to fix statics Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/63b94ad5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/63b94ad5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/63b94ad5 Branch: refs/heads/master Commit: 63b94ad59600b05ce0bc1038b8b3c7bf5c4e5fb5 Parents: ce85e43 Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 14:35:51 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 14:35:51 2017 +0700 ---------------------------------------------------------------------- .../openmeetings/core/mail/MailHandler.java | 4 ++-- .../core/remote/ScopeApplicationAdapter.java | 4 ++-- .../db/dao/basic/ConfigurationDao.java | 11 +++++----- .../apache/openmeetings/db/dto/basic/Info.java | 4 ++-- .../openmeetings/db/util/ApplicationHelper.java | 4 ++-- .../src/site/xdoc/WebappNamePath.xml | 4 ---- .../service/quartz/scheduler/AbstractJob.java | 4 ++-- .../service/quartz/scheduler/CleanupJob.java | 10 ++++----- .../service/quartz/scheduler/ReminderJob.java | 4 ++-- .../util/InitializationContainer.java | 23 -------------------- .../openmeetings/util/OMContextListener.java | 3 +-- .../util/OpenmeetingsVariables.java | 12 ++++++++-- .../web/admin/AdminUserChoiceProvider.java | 2 +- .../openmeetings/web/app/Application.java | 5 ++--- .../web/common/tree/OmTreeProvider.java | 12 +++++----- .../openmeetings/web/pages/NotInitedPage.java | 4 ++-- 16 files changed, 45 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 a07c96a..f4845c9 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 @@ -58,7 +58,7 @@ 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.InitializationContainer; +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; @@ -270,7 +270,7 @@ public class MailHandler { public void resetSendingStatus() { log.debug("resetSendingStatus enter ..."); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } Calendar c = Calendar.getInstance(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 21faa87..a04d453 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 @@ -50,9 +50,9 @@ import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.log.ConferenceLog; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.StreamClient; -import org.apache.openmeetings.util.InitializationContainer; 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; @@ -130,7 +130,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp _log.debug("scopeName :: " + scopeName); } - InitializationContainer.initComplete = true; + OpenmeetingsVariables.initComplete = true; // Init properties IApplication iapp = getApp(); iapp.setXFrameOptions(cfgDao.getString(CONFIG_HEADER_XFRAME, HEADER_XFRAME_SAMEORIGIN)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 3d5563d..65c3209 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 @@ -18,7 +18,6 @@ */ package org.apache.openmeetings.db.dao.basic; -import static org.apache.openmeetings.util.OpenmeetingsVariables.APPLICATION_NAME; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_BASE_URL; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPLICATION_NAME; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CRYPT; @@ -54,6 +53,8 @@ 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.setApplicationName; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName; @@ -211,10 +212,10 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { } public String getAppName() { - if (APPLICATION_NAME == null) { - APPLICATION_NAME = getString(CONFIG_APPLICATION_NAME, DEFAULT_APP_NAME); + if (getApplicationName() == null) { + setApplicationName(getString(CONFIG_APPLICATION_NAME, DEFAULT_APP_NAME));; } - return APPLICATION_NAME; + return getApplicationName(); } public String getBaseUrl() { @@ -304,7 +305,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> { CryptProvider.reset(); break; case CONFIG_APPLICATION_NAME: - APPLICATION_NAME = value; + setApplicationName(value); break; case CONFIG_HEADER_XFRAME: { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 a32dd66..b7b95cb 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 @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.openmeetings.util.InitializationContainer; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.Version; @XmlRootElement @@ -40,7 +40,7 @@ public class Info implements Serializable { version = Version.getVersion(); revision = Version.getRevision(); buildDate = Version.getBuildDate(); - inited = InitializationContainer.initComplete; + inited = OpenmeetingsVariables.initComplete; } public String getVersion() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 ba1f56d..e1bce4b 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 @@ -30,8 +30,8 @@ import javax.servlet.ServletContextEvent; import org.apache.openmeetings.IApplication; import org.apache.openmeetings.IWebSession; import org.apache.openmeetings.db.dao.label.LabelDao; -import org.apache.openmeetings.util.InitializationContainer; 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; @@ -61,7 +61,7 @@ public class ApplicationHelper { WebApplication app = (WebApplication)ensureApplication(langId); WicketTester tester = new WicketTester(app, app.getServletContext()); - InitializationContainer.initComplete = true; + OpenmeetingsVariables.initComplete = true; return tester; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/openmeetings-server/src/site/xdoc/WebappNamePath.xml ---------------------------------------------------------------------- diff --git a/openmeetings-server/src/site/xdoc/WebappNamePath.xml b/openmeetings-server/src/site/xdoc/WebappNamePath.xml index bf6776e..0700f37 100644 --- a/openmeetings-server/src/site/xdoc/WebappNamePath.xml +++ b/openmeetings-server/src/site/xdoc/WebappNamePath.xml @@ -118,10 +118,6 @@ <tt>http://yourcorp.com:5080/openmeetings2</tt><br/> etc.<br/> you need to do the following: </p> <ol> - <li>edit <tt>webapps/openmeetings1/WEB-INF/red5-web.properties</tt> for <strong>every</strong> Openmeetings - instance and add the following line <tt>webapp.contextPath=/openmeetings1</tt> to it (context of - <strong>every</strong> instance <strong>should</strong> match the folder name in webapps dir) - </li> <li>in case of java memory problems modify <tt>red5.sh</tt> add following line:<br/> <source>export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M"</source> or <tt>red5.bat</tt>:<br/> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 82605d7..8cd46eb 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 @@ -28,7 +28,7 @@ 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.InitializationContainer; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ public abstract class AbstractJob { RecordingDao recordingDao; void processExpiringRecordings(boolean notified, BiConsumer<Recording, Long> consumer) { - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } for (Group g : groupDao.getLimited()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 856869b..816ddc6 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 @@ -37,7 +37,7 @@ 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.InitializationContainer; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -74,7 +74,7 @@ public class CleanupJob extends AbstractJob { public void cleanTestSetup() { log.debug("CleanupJob.cleanTestSetup"); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } try { @@ -107,7 +107,7 @@ public class CleanupJob extends AbstractJob { public void cleanRoomFiles() { log.debug("CleanupJob.cleanRoomFiles"); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } try { @@ -148,7 +148,7 @@ public class CleanupJob extends AbstractJob { public void cleanSessions() { log.trace("CleanupJob.cleanSessions"); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } try { @@ -175,7 +175,7 @@ public class CleanupJob extends AbstractJob { public void cleanExpiredResetHash() { log.debug("CleanupJob.cleanExpiredResetHash"); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } List<User> users = userDao.getByExpiredHash(resetHashTtl); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 13edce1..854284a 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 @@ -26,7 +26,7 @@ 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.InitializationContainer; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +44,7 @@ public class ReminderJob extends AbstractJob { public void remindMeetings() { log.debug("ReminderJob.remindMeetings"); - if (!InitializationContainer.initComplete) { + if (!OpenmeetingsVariables.initComplete) { return; } try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/openmeetings-util/src/main/java/org/apache/openmeetings/util/InitializationContainer.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/InitializationContainer.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/InitializationContainer.java deleted file mode 100644 index e47b53f..0000000 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/InitializationContainer.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License") + you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.openmeetings.util; - -public class InitializationContainer { - public static boolean initComplete = false; -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 7b766c0..71015d1 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 @@ -32,9 +32,8 @@ public class OMContextListener extends ContextLoggingListener { @Override public void contextInitialized(ServletContextEvent event) { OpenmeetingsVariables.webAppRootKey = pathToName(event); - OpenmeetingsVariables.webAppRootPath = "/" + OpenmeetingsVariables.webAppRootKey; System.setProperty("current_openmeetings_context_name", OpenmeetingsVariables.webAppRootKey); - System.setProperty("webapp.contextPath", OpenmeetingsVariables.webAppRootPath); + System.setProperty("webapp.contextPath", String.format("/%s", OpenmeetingsVariables.webAppRootKey)); System.setProperty("logback.configurationFile", "logback-config.xml"); super.contextInitialized(event); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 4d18b34..c910cec 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 @@ -109,10 +109,18 @@ public class OpenmeetingsVariables { public static final String DEFAULT_BASE_URL = "http://localhost:5080/openmeetings/";; public static String webAppRootKey = null; - public static String webAppRootPath = null; public static String configKeyCryptClassName = null; public static String wicketApplicationName = null; - public static String APPLICATION_NAME = 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; + + public static String getApplicationName() { + return applicationName; + } + + public static void setApplicationName(String applicationName) { + OpenmeetingsVariables.applicationName = applicationName; + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java index 6993bd5..9fc9b69 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java @@ -31,7 +31,7 @@ import org.wicketstuff.select2.Response; public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> { private static final long serialVersionUID = 1L; - public static int PAGE_SIZE = 20; + public static final int PAGE_SIZE = 20; @Override public String getIdValue(User choice) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 a188fa7..5f6c0e6 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 @@ -71,7 +71,6 @@ import org.apache.openmeetings.db.entity.room.StreamClient; import org.apache.openmeetings.db.entity.server.Sessiondata; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Type; -import org.apache.openmeetings.util.InitializationContainer; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.util.message.RoomMessage; import org.apache.openmeetings.util.ws.IClusterWsMessage; @@ -742,7 +741,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica public static boolean isInstalled() { boolean result = isInstalled; if (!isInstalled) { - if (InitializationContainer.initComplete) { + if (OpenmeetingsVariables.initComplete) { //TODO can also check crypt class here isInstalled = result = get()._getBean(UserDao.class).count() > 0; } @@ -751,7 +750,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica } public static <T> T getBean(Class<T> clazz) { - if (InitializationContainer.initComplete) { + if (OpenmeetingsVariables.initComplete) { if (!isInstalled()) { throw new RestartResponseException(InstallWizardPage.class); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java index 3d12ba6..c772b52 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java @@ -45,12 +45,12 @@ import org.apache.wicket.model.Model; public class OmTreeProvider implements ITreeProvider<BaseFileItem> { private static final long serialVersionUID = 1L; private static final List<Type> VIDEO_TYPES = Arrays.asList(Type.Folder, Type.Video); - public static String RECORDINGS_MY = "recordings-my"; - public static String RECORDINGS_PUBLIC = "recordings-public"; - public static String RECORDINGS_GROUP = "recordings-group-%s"; - public static String FILES_MY = "files-my"; - public static String FILES_ROOM = "files-room"; - public static String FILES_GROUP = "files-group-%s"; + public static final String RECORDINGS_MY = "recordings-my"; + public static final String RECORDINGS_PUBLIC = "recordings-public"; + public static final String RECORDINGS_GROUP = "recordings-group-%s"; + public static final String FILES_MY = "files-my"; + public static final String FILES_ROOM = "files-room"; + public static final String FILES_GROUP = "files-group-%s"; private final Long roomId; private final List<BaseFileItem> roots = new ArrayList<>(); private final String PUBLIC, GROUP_FILE, GROUP_REC; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/63b94ad5/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 a084d15..915fc50 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,7 @@ */ package org.apache.openmeetings.web.pages; -import org.apache.openmeetings.util.InitializationContainer; +import org.apache.openmeetings.util.OpenmeetingsVariables; import org.apache.openmeetings.web.app.Application; import org.apache.wicket.RestartResponseException; @@ -26,7 +26,7 @@ public class NotInitedPage extends BaseNotInitedPage { private static final long serialVersionUID = 1L; public NotInitedPage() { - if (InitializationContainer.initComplete) { + if (OpenmeetingsVariables.initComplete) { continueToOriginalDestination(); // Ups, no original destination. Go to the home page throw new RestartResponseException(Application.get().getHomePage());
