You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/08/02 09:12:33 UTC

openmeetings git commit: [OPENMEETINGS-1677] html5 wb should work as expected

Repository: openmeetings
Updated Branches:
  refs/heads/master 0e6b60a88 -> 22d0528d6


[OPENMEETINGS-1677] html5 wb should work as expected


Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/22d0528d
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/22d0528d
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/22d0528d

Branch: refs/heads/master
Commit: 22d0528d65e1904fb4177e74cc7243a883554d24
Parents: 0e6b60a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Aug 2 16:12:25 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Aug 2 16:12:25 2017 +0700

----------------------------------------------------------------------
 .../core/data/whiteboard/WhiteboardCache.java   | 73 ++++++++++++++------
 .../org/apache/openmeetings/IApplication.java   |  3 +
 .../openmeetings/db/dto/room/Whiteboard.java    | 48 +++++++++----
 .../openmeetings/db/dto/room/Whiteboards.java   |  8 ++-
 .../service/quartz/scheduler/CleanupJob.java    |  6 +-
 .../openmeetings/web/app/Application.java       |  7 ++
 .../web/room/RoomResourceReference.java         |  2 +-
 .../openmeetings/web/room/wb/WbPanel.java       | 64 ++++++++---------
 .../user/record/RecordingResourceReference.java |  4 +-
 .../WEB-INF/classes/applicationContext.xml      |  2 -
 .../main/webapp/WEB-INF/classes/hazelcast.xml   |  2 +-
 11 files changed, 143 insertions(+), 76 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
index 5adb304..8253815 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
@@ -18,14 +18,17 @@
  */
 package org.apache.openmeetings.core.data.whiteboard;
 
+import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
+
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.openmeetings.IApplication;
 import org.apache.openmeetings.db.dao.label.LabelDao;
 import org.apache.openmeetings.db.dto.room.Whiteboard;
 import org.apache.openmeetings.db.dto.room.Whiteboards;
+import org.apache.wicket.Application;
 
 /**
  * Memory based cache, configured as singleton in spring configuration
@@ -34,7 +37,10 @@ import org.apache.openmeetings.db.dto.room.Whiteboards;
  *
  */
 public class WhiteboardCache {
-	private Map<Long, Whiteboards> cache = new ConcurrentHashMap<>();
+	private static Map<Long, Whiteboards> getCache() {
+		IApplication iapp = (IApplication)Application.get(wicketApplicationName);
+		return iapp.getWhiteboards();
+	}
 
 	private static String getDefaultName(Long langId, int num) {
 		StringBuilder sb = new StringBuilder(LabelDao.getString("615", langId));
@@ -44,47 +50,70 @@ public class WhiteboardCache {
 		return sb.toString();
 	}
 
-	public Set<Entry<Long, Whiteboard>> list(Long roomId, Long langId) {
+	public static Whiteboards get(Long roomId) {
+		if (roomId == null) {
+			return null;
+		}
+		Whiteboards wbs = getCache().get(roomId);
+		if (wbs == null) {
+			wbs = new Whiteboards(roomId);
+			update(wbs);
+		}
+		return wbs;
+	}
+
+	public static Set<Entry<Long, Whiteboard>> list(Long roomId, Long langId) {
 		Whiteboards wbs = get(roomId);
 		if (wbs.getWhiteboards().isEmpty()) {
 			Whiteboard wb = add(wbs, langId);
 			wbs.setActiveWb(wb.getId());
+			update(wbs);
 		}
 		return wbs.getWhiteboards().entrySet();
 	}
 
-	public Whiteboard add(Long roomId, Long langId) {
+	public static Whiteboard add(Long roomId, Long langId) {
 		Whiteboards wbs = get(roomId);
-		return add(wbs, langId);
+		Whiteboard wb = add(wbs, langId);
+		update(wbs);
+		return wb;
 	}
 
-	public Whiteboard add(Whiteboards wbs, Long langId) {
+	private static Whiteboard add(Whiteboards wbs, Long langId) {
 		Whiteboard wb = new Whiteboard(getDefaultName(langId, wbs.count()));
 		wbs.add(wb);
 		return wb;
 	}
 
-	public Whiteboards get(Long roomId) {
-		if (roomId == null) {
-			return null;
-		}
-		Whiteboards wbs = cache.get(roomId);
-		if (wbs == null) {
-			wbs = new Whiteboards(roomId);
-			cache.put(roomId, wbs);
-		}
-		return wbs;
-	}
-
-	public void clear(Long roomId, Long wbId) {
-		Whiteboard wb = get(roomId).get(wbId);
+	public static void clear(Long roomId, Long wbId) {
+		Whiteboards wbs = get(roomId);
+		Whiteboard wb = wbs.get(wbId);
 		if (wb != null) {
 			wb.clear();
+			update(wbs);
 		}
 	}
 
-	public Whiteboard remove(Long roomId, Long wbId) {
+	public static Whiteboard remove(Long roomId, Long wbId) {
 		Whiteboards wbs = get(roomId);
-		return wbs.getWhiteboards().remove(wbId);
+		Whiteboard wb = wbs.getWhiteboards().remove(wbId);
+		update(wbs);
+		return wb;
+	}
+
+	public static void activate(Long roomId, Long wbId) {
+		Whiteboards wbs = get(roomId);
+		wbs.setActiveWb(wbId);
+		update(wbs);
+	}
+
+	public static void update(Long roomId, Whiteboard wb) {
+		Whiteboards wbs = get(roomId);
+		wbs.update(wb);
+		update(wbs);
+	}
+
+	private static void update(Whiteboards wbs) {
+		getCache().put(wbs.getRoomId(), wbs);
 	}
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
index 82ef733..3c5b6bc 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
@@ -27,6 +27,7 @@ import java.util.function.Supplier;
 import javax.servlet.ServletContext;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dto.room.Whiteboards;
 import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.room.Invitation;
 import org.apache.openmeetings.db.entity.room.StreamClient;
@@ -70,4 +71,6 @@ public interface IApplication {
 
 	//WS
 	void publishWsTopic(IClusterWsMessage msg);
+
+	Map<Long, Whiteboards> getWhiteboards();
 }

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 393f608..81a4534 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -18,24 +18,28 @@
  */
 package org.apache.openmeetings.db.dto.room;
 
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
 import org.apache.openmeetings.util.NullStringer;
 
+import com.github.openjson.JSONArray;
 import com.github.openjson.JSONObject;
 
-public class Whiteboard {
+public class Whiteboard implements Serializable {
+	private static final long serialVersionUID = 1L;
 	private long id;
 	private Integer x = 0;
 	private Integer y = 0;
 	private Integer zoom = 100;
 	private Boolean fullFit = true;
-	private Map<String, JSONObject> roomItems = Collections.synchronizedMap(new LinkedHashMap<>());
+	private Map<String, String> roomItems = Collections.synchronizedMap(new LinkedHashMap<>());
 	private Date created = new Date();
 	private int slide = 0;
 	private String name;
@@ -98,24 +102,44 @@ public class Whiteboard {
 		roomItems.clear();
 	}
 
-	public Map<String, JSONObject> getRoomItems() {
-		return roomItems;
+	public void put(String uid, JSONObject obj) {
+		roomItems.put(uid, obj.toString(new NullStringer()));
 	}
 
-	public JSONObject put(String uid, JSONObject obj) {
-		return roomItems.put(uid, obj);
+	public JSONObject get(String uid) {
+		return new JSONObject(roomItems.get(uid));
 	}
 
-	public JSONObject get(String uid) {
-		return roomItems.get(uid);
+	public boolean contains(String uid) {
+		return roomItems.containsKey(uid);
 	}
 
-	public Set<Entry<String, JSONObject>> entrySet() {
-		return roomItems.entrySet();
+	public JSONArray clearSlide(int slide) {
+		JSONArray arr = new JSONArray();
+		roomItems.entrySet().removeIf(e -> {
+				boolean match = new JSONObject(e.getValue()).optInt("slide", -1) == slide;
+				if (match) {
+					arr.put(e);
+				}
+				return match;
+			});
+		return arr;
+	}
+
+	public List<JSONObject> list() {
+		List<JSONObject> items = new LinkedList<>();
+		for (Entry<String, String> e : roomItems.entrySet()) {
+			items.add(new JSONObject(e.getValue()));
+		}
+		return items;
 	}
 
 	public JSONObject remove(Object oid) {
-		return roomItems.remove(oid);
+		return new JSONObject(roomItems.remove(oid));
+	}
+
+	public boolean isEmpty() {
+		return roomItems.isEmpty();
 	}
 
 	public String getName() {

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
index dc3413f..ab0cbeb 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboards.java
@@ -18,12 +18,14 @@
  */
 package org.apache.openmeetings.db.dto.room;
 
+import java.io.Serializable;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-public class Whiteboards {
+public class Whiteboards implements Serializable {
+	private static final long serialVersionUID = 1L;
 	private Long roomId;
 	private final String uid = UUID.randomUUID().toString();
 	private Map<Long, Whiteboard> whiteboards = new ConcurrentHashMap<>();
@@ -66,6 +68,10 @@ public class Whiteboards {
 		this.whiteboards = whiteboards;
 	}
 
+	public void update(Whiteboard wb) {
+		whiteboards.put(wb.getId(), wb);
+	}
+
 	public String getUid() {
 		return uid;
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/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 3ae9ed6..856869b 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
@@ -54,8 +54,6 @@ public class CleanupJob extends AbstractJob {
 	@Autowired
 	private ISessionManager sessionManager;
 	@Autowired
-	private WhiteboardCache wbCache;
-	@Autowired
 	private UserDao userDao;
 
 	public void setSessionTimeout(long sessionTimeout) {
@@ -120,9 +118,9 @@ public class CleanupJob extends AbstractJob {
 					Long roomId = null;
 					if (NumberUtils.isCreatable(folder.getName())) {
 						roomId = Long.valueOf(folder.getName());
-						Whiteboards wbList = wbCache.get(roomId);
+						Whiteboards wbList = WhiteboardCache.get(roomId);
 						for (Map.Entry<Long, Whiteboard> e : wbList.getWhiteboards().entrySet()) {
-							if (!e.getValue().getRoomItems().isEmpty()) {
+							if (!e.getValue().isEmpty()) {
 								roomId = null;
 								break;
 							}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/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 07b05c9..0035925 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
@@ -55,6 +55,7 @@ import org.apache.openmeetings.db.dao.label.LabelDao;
 import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
 import org.apache.openmeetings.db.dao.server.SessiondataDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.dto.room.Whiteboards;
 import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.basic.Client.Activity;
 import org.apache.openmeetings.db.entity.basic.Client.Pod;
@@ -146,6 +147,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica
 	private final static String UID_BY_SID_KEY = "UID_BY_SID_KEY";
 	private final static String INVALID_SESSIONS_KEY = "INVALID_SESSIONS_KEY";
 	private final static String ROOMS_KEY = "ROOMS_KEY";
+	private final static String WBS_KEY = "WBS_KEY";
 	private final static String STREAM_CLIENT_KEY = "STREAM_CLIENT_KEY";
 	public final static String NAME_ATTR_KEY = "name";
 	//additional maps for faster searching should be created
@@ -349,6 +351,11 @@ public class Application extends AuthenticatedWebApplication implements IApplica
 	}
 
 	@Override
+	public Map<Long, Whiteboards> getWhiteboards() {
+		return hazelcast.getMap(WBS_KEY);
+	}
+
+	@Override
 	public Set<Long> getActiveRoomIds() {
 		return getRooms().keySet();
 	}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index c4fd8bf..aaf2acb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -102,7 +102,7 @@ public class RoomResourceReference extends FileItemResourceReference<FileExplore
 		FileExplorerItem f = getBean(FileExplorerItemDao.class).get(id);
 		String ruid = params.get("ruid").toString();
 		String wuid = params.get("wuid").toString();
-		Whiteboards wbs = getBean(WhiteboardCache.class).get(c.getRoomId());
+		Whiteboards wbs = WhiteboardCache.get(c.getRoomId());
 		if (!Strings.isEmpty(wuid) && !Strings.isEmpty(ruid) && ruid.equals(wbs.getUid())) {
 			for (Entry<Long, Whiteboard> e : wbs.getWhiteboards().entrySet()) {
 				JSONObject file = e.getValue().get(wuid);

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/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 0b90903..afeca53 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
@@ -127,7 +127,7 @@ public class WbPanel extends Panel {
 					switch (a) {
 						case createWb:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).add(roomId, c.getUser().getLanguageId());
+							Whiteboard wb = WhiteboardCache.add(roomId, c.getUser().getLanguageId());
 							sendWbAll(WbAction.createWb, getAddWbJson(wb.getId(), wb.getName()));
 						}
 							break;
@@ -135,7 +135,7 @@ public class WbPanel extends Panel {
 						{
 							long _id = obj.optLong("wbId", -1);
 							Long id = _id < 0 ? null : _id;
-							getBean(WhiteboardCache.class).remove(roomId, id);
+							WhiteboardCache.remove(roomId, id);
 							sendWbAll(WbAction.removeWb, obj);
 						}
 							break;
@@ -143,23 +143,22 @@ public class WbPanel extends Panel {
 						{
 							long _id = obj.optLong("wbId", -1);
 							if (_id > -1) {
-								Whiteboards wbs = getBean(WhiteboardCache.class).get(roomId);
-								wbs.setActiveWb(_id);
+								WhiteboardCache.activate(roomId, _id);
 								sendWbAll(WbAction.activateWb, obj);
 							}
 						}
 							break;
 						case setSlide:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
+							Whiteboard wb = WhiteboardCache.get(roomId).get(obj.getLong("wbId"));
 							wb.setSlide(obj.optInt("slide", 0));
+							WhiteboardCache.update(roomId, wb);
 							sendWbOthers(WbAction.setSlide, obj);
 						}
 							break;
 						case clearAll:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
-							clearAll(wb);
+							clearAll(roomId, obj.getLong("wbId"));
 						}
 							break;
 						default:
@@ -171,16 +170,17 @@ public class WbPanel extends Panel {
 					switch (a) {
 						case createObj:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
+							Whiteboard wb = WhiteboardCache.get(roomId).get(obj.getLong("wbId"));
 							JSONObject o = obj.getJSONObject("obj");
 							wb.put(o.getString("uid"), o);
+							WhiteboardCache.update(roomId, wb);
 							addUndo(wb.getId(), new UndoObject(UndoObject.Type.add, o));
 							sendWbOthers(WbAction.createObj, obj);
 						}
 							break;
 						case modifyObj:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
+							Whiteboard wb = WhiteboardCache.get(roomId).get(obj.getLong("wbId"));
 							JSONArray arr = obj.getJSONArray("obj");
 							JSONArray undo = new JSONArray();
 							for (int i = 0; i < arr.length(); ++i) {
@@ -190,6 +190,7 @@ public class WbPanel extends Panel {
 								wb.put(uid, _o);
 							}
 							if (arr.length() != 0) {
+								WhiteboardCache.update(roomId, wb);
 								addUndo(wb.getId(), new UndoObject(UndoObject.Type.modify, undo));
 							}
 							sendWbOthers(WbAction.modifyObj, obj);
@@ -197,7 +198,7 @@ public class WbPanel extends Panel {
 							break;
 						case deleteObj:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
+							Whiteboard wb = WhiteboardCache.get(roomId).get(obj.getLong("wbId"));
 							JSONArray arr = obj.getJSONArray("obj");
 							JSONArray undo = new JSONArray();
 							for (int i = 0; i < arr.length(); ++i) {
@@ -208,6 +209,7 @@ public class WbPanel extends Panel {
 								}
 							}
 							if (undo.length() != 0) {
+								WhiteboardCache.update(roomId, wb);
 								addUndo(wb.getId(), new UndoObject(UndoObject.Type.remove, undo));
 							}
 							sendWbAll(WbAction.deleteObj, obj);
@@ -215,16 +217,10 @@ public class WbPanel extends Panel {
 							break;
 						case clearSlide:
 						{
-							Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(obj.getLong("wbId"));
-							JSONArray arr = new JSONArray();
-							wb.entrySet().removeIf(e -> {
-									boolean match = e.getValue().optInt("slide", -1) == obj.getInt("slide");
-									if (match) {
-										arr.put(e);
-									}
-									return match;
-								});
+							Whiteboard wb = WhiteboardCache.get(roomId).get(obj.getLong("wbId"));
+							JSONArray arr = wb.clearSlide(obj.getInt("slide"));
 							if (arr.length() != 0) {
+								WhiteboardCache.update(roomId, wb);
 								addUndo(wb.getId(), new UndoObject(UndoObject.Type.remove, arr));
 							}
 							sendWbAll(WbAction.clearSlide, obj);
@@ -258,7 +254,7 @@ public class WbPanel extends Panel {
 					}
 				}
 			} catch (Exception e) {
-				// no-op
+				log.error("Unexpected error while processing wbAction", e);
 			}
 		}
 	};
@@ -267,7 +263,7 @@ public class WbPanel extends Panel {
 
 		@Override
 		protected void onSubmit(AjaxRequestTarget target) {
-			Whiteboard wb = getBean(WhiteboardCache.class).get(roomId).get(wb2save);
+			Whiteboard wb = WhiteboardCache.get(roomId).get(wb2save);
 			FileExplorerItem f = new FileExplorerItem();
 			f.setType(Type.WmlFile);
 			f.setRoomId(roomId);
@@ -304,15 +300,13 @@ public class WbPanel extends Panel {
 		@Override
 		protected void respond(AjaxRequestTarget target) {
 			StringBuilder sb = new StringBuilder("WbArea.init();");
-			WhiteboardCache cache = getBean(WhiteboardCache.class);
-			Whiteboards wbs = cache.get(roomId);
-			for (Entry<Long, Whiteboard> entry : cache.list(roomId, rp.getClient().getUser().getLanguageId())) {
+			Whiteboards wbs = WhiteboardCache.get(roomId);
+			for (Entry<Long, Whiteboard> entry : WhiteboardCache.list(roomId, rp.getClient().getUser().getLanguageId())) {
 				sb.append(new StringBuilder("WbArea.create(")
 						.append(getAddWbJson(entry.getKey(), entry.getValue().getName()).toString())
 						.append(");"));
 				JSONArray arr = new JSONArray();
-				for (Entry<String, JSONObject> wbEntry : entry.getValue().entrySet()) {
-					JSONObject o = wbEntry.getValue();
+				for (JSONObject o : entry.getValue().list()) {
 					arr.put(addFileUrl(wbs.getUid(), o));
 				}
 				sb.append("WbArea.load(").append(getObjWbJson(entry.getKey(), arr).toString(new NullStringer())).append(");");
@@ -401,20 +395,23 @@ public class WbPanel extends Panel {
 		return arr;
 	}
 
-	private void clearAll(Whiteboard wb) {
+	private void clearAll(Long roomId, long wbId) {
+		Whiteboard wb = WhiteboardCache.get(roomId).get(wbId);
+
 		JSONArray arr = getArray(wb.toJson(), null);
 		if (arr.length() != 0) {
 			addUndo(wb.getId(), new UndoObject(UndoObject.Type.remove, arr));
 		}
-		wb.clear();
+		WhiteboardCache.clear(roomId, wbId);
 		sendWbAll(WbAction.clearAll, new JSONObject().put("wbId", wb.getId()));
 	}
 
 	public void sendFileToWb(FileItem fi, boolean clean) {
 		if (isVisible() && fi.getId() != null) {
-			Whiteboards wbs = getBean(WhiteboardCache.class).get(roomId);
+			Whiteboards wbs = WhiteboardCache.get(roomId);
 			String wuid = UUID.randomUUID().toString();
 			Whiteboard wb = wbs.get(wbs.getActiveWb());
+			final boolean[] updated = {false};
 			switch (fi.getType()) {
 				case Folder:
 					//do nothing
@@ -425,7 +422,8 @@ public class WbPanel extends Panel {
 					if (f.exists() && f.isFile()) {
 						try (BufferedReader br = Files.newBufferedReader(f.toPath())) {
 							JSONArray arr = getArray(new JSONObject(new JSONTokener(br)), (o) -> {
-									wb.getRoomItems().put(o.getString("uid"), o);
+									wb.put(o.getString("uid"), o);
+									updated[0] = true;
 									return addFileUrl(wbs.getUid(), o);
 								});
 							sendWbAll(WbAction.load, getObjWbJson(wb.getId(), arr));
@@ -453,13 +451,17 @@ public class WbPanel extends Panel {
 							;
 					final String ruid = wbs.getUid();
 					if (clean) {
-						clearAll(wb);
+						clearAll(roomId, wb.getId());
 					}
 					wb.put(wuid, file);
+					updated[0] = true;
 					WbWebSocketHelper.sendWbFile(roomId, wb.getId(), ruid, file, fi);
 				}
 					break;
 			}
+			if (updated[0]) {
+				WhiteboardCache.update(roomId, wb);
+			}
 		}
 	}
 

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index 763d705..8a0e9a0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -94,10 +94,10 @@ public abstract class RecordingResourceReference extends FileItemResourceReferen
 		}
 		Client c = getOnlineClient(uid);
 		if (c != null) {
-			Whiteboards wbs = getBean(WhiteboardCache.class).get(c.getRoomId());
+			Whiteboards wbs = WhiteboardCache.get(c.getRoomId());
 			if (wbs != null && !Strings.isEmpty(ruid) && ruid.equals(wbs.getUid())) {
 				for (Entry<Long, Whiteboard> e : wbs.getWhiteboards().entrySet()) {
-					if (e.getValue().getRoomItems().containsKey(r.getHash())) {
+					if (e.getValue().contains(r.getHash())) {
 						return r; // item IS on WB
 					}
 				}

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 53db861..10e4428 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -44,8 +44,6 @@
 
 	<bean id="openmeetings.SessionManager" class="org.apache.openmeetings.core.session.SessionManager"/>
 	
-	<bean id="whiteboardCache" scope="singleton" class="org.apache.openmeetings.core.data.whiteboard.WhiteboardCache" />
-
 	<!-- Start of Services -->
 	<bean id="xmlcrm.service" class="org.apache.openmeetings.core.remote.MainService" />
 	<bean id="openmeetings.FileProcessor" class="org.apache.openmeetings.core.data.file.FileProcessor" />

http://git-wip-us.apache.org/repos/asf/openmeetings/blob/22d0528d/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
----------------------------------------------------------------------
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 dfb8d92..b4a1960 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
 <hazelcast
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xmlns="http://www.hazelcast.com/schema/config"
-		xsi:schemaLocation="http://www.hazelcast.com/schema/config https://hazelcast.com/schema/config/hazelcast-config-3.9.xsd"
+		xsi:schemaLocation="http://www.hazelcast.com/schema/config https://hazelcast.com/schema/config/hazelcast-config-3.8.xsd"
 	>
 	<instance-name>server-1</instance-name><!-- MAKE SURE THIS ONE IS UNIQUE -->
 	<!--network>