You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/03/26 15:48:42 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1836] tests
should be fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 45d685a [OPENMEETINGS-1836] tests should be fixed
45d685a is described below
commit 45d685a0e053550dd809a6a5f2415eba33a2ca8f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Mar 26 22:48:21 2018 +0700
[OPENMEETINGS-1836] tests should be fixed
---
.../org/apache/openmeetings/web/app/Application.java | 4 +++-
.../org/apache/openmeetings/web/app/ClientManager.java | 17 +++++++++--------
.../apache/openmeetings/web/app/WhiteboardManager.java | 9 ++++++---
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 8 ++++----
4 files changed, 22 insertions(+), 16 deletions(-)
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 7571782..5314833 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
@@ -109,6 +109,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.mapper.parameter.PageParametersEncoder;
import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
+import org.springframework.stereotype.Component;
import org.springframework.web.context.WebApplicationContext;
import org.wicketstuff.dashboard.WidgetRegistry;
import org.wicketstuff.dashboard.web.DashboardContext;
@@ -125,6 +126,7 @@ import com.hazelcast.core.MemberAttributeEvent;
import com.hazelcast.core.MembershipEvent;
import com.hazelcast.core.MembershipListener;
+@Component
public class Application extends AuthenticatedWebApplication implements IApplication {
private static final Logger log = getLogger(Application.class, getWebAppRootKey());
private static boolean isInstalled;
@@ -141,7 +143,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
public static final String HASH_MAPPING = "/hash";
public static final String SIGNIN_MAPPING = "/signin";
public static final String NOTINIT_MAPPING = "/notinited";
- private final HazelcastInstance hazelcast = Hazelcast.getOrCreateHazelcastInstance(new XmlConfigBuilder().build());
+ final HazelcastInstance hazelcast = Hazelcast.getOrCreateHazelcastInstance(new XmlConfigBuilder().build());
private String xFrameOptions = HEADER_XFRAME_SAMEORIGIN;
private String contentSecurityPolicy = OpenmeetingsVariables.HEADER_CSP_SELF;
private ITopic<IClusterWsMessage> hazelWsTopic;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index ccce0a7..4987fe3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
-import static org.apache.openmeetings.web.app.Application.getHazelcast;
import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.ArrayList;
@@ -69,17 +68,19 @@ public class ClientManager implements IClientManager {
private ConferenceLogDao confLogDao;
@Autowired
private ScopeApplicationAdapter scopeAdapter;
+ @Autowired
+ private Application app;
- private static IMap<String, Client> map() {
- return getHazelcast().getMap(ONLINE_USERS_KEY);
+ private IMap<String, Client> map() {
+ return app.hazelcast.getMap(ONLINE_USERS_KEY);
}
- private static Map<String, String> mapBySid() {
- return getHazelcast().getMap(UID_BY_SID_KEY);
+ private Map<String, String> mapBySid() {
+ return app.hazelcast.getMap(UID_BY_SID_KEY);
}
- private static IMap<Long, Set<String>> rooms() {
- return getHazelcast().getMap(ROOMS_KEY);
+ private IMap<Long, Set<String>> rooms() {
+ return app.hazelcast.getMap(ROOMS_KEY);
}
@PostConstruct
@@ -278,7 +279,7 @@ public class ClientManager implements IClientManager {
return false;
}
- private static Client getByKeys(Long userId, String sessionId) {
+ private Client getByKeys(Long userId, String sessionId) {
Client client = null;
for (Map.Entry<String, Client> e : map().entrySet()) {
Client c = e.getValue();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 33e7f93..a2f9def 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultLang;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey;
-import static org.apache.openmeetings.web.app.Application.getHazelcast;
import static org.red5.logging.Red5LoggerFactory.getLogger;
import java.util.Map;
@@ -35,6 +34,7 @@ import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.manager.IWhiteboardManager;
import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.hazelcast.core.EntryEvent;
@@ -55,8 +55,11 @@ public class WhiteboardManager implements IWhiteboardManager {
private final Map<Long, Whiteboards> onlineWbs = new ConcurrentHashMap<>();
private static final String WBS_KEY = "WBS_KEY";
- private static IMap<Long, Whiteboards> map() {
- return getHazelcast().getMap(WBS_KEY);
+ @Autowired
+ private Application app;
+
+ private IMap<Long, Whiteboards> map() {
+ return app.hazelcast.getMap(WBS_KEY);
}
@PostConstruct
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index 65cc426..57cd2e4 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -32,28 +32,28 @@
</map>
<map name="ROOMS_KEY">
<near-cache>
- <eviction-policy>NONE</eviction-policy>
+ <eviction eviction-policy="NONE"/>
<in-memory-format>OBJECT</in-memory-format>
<cache-local-entries>true</cache-local-entries>
</near-cache>
</map>
<map name="UID_BY_SID_KEY">
<near-cache>
- <eviction-policy>NONE</eviction-policy>
+ <eviction eviction-policy="NONE"/>
<in-memory-format>OBJECT</in-memory-format>
<cache-local-entries>true</cache-local-entries>
</near-cache>
</map>
<map name="WBS_KEY">
<near-cache>
- <eviction-policy>NONE</eviction-policy>
+ <eviction eviction-policy="NONE"/>
<in-memory-format>OBJECT</in-memory-format>
<cache-local-entries>true</cache-local-entries>
</near-cache>
</map>
<map name="STREAM_CLIENT_KEY">
<near-cache>
- <eviction-policy>NONE</eviction-policy>
+ <eviction eviction-policy="NONE"/>
<in-memory-format>OBJECT</in-memory-format>
<cache-local-entries>true</cache-local-entries>
</near-cache>
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.