Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
In directory james.mmbase.org:/tmp/cvs-serv13389
Modified Files:
LayoutCacheEntryFactory.java MMBaseCacheEntryFactory.java
NavigationCacheEntryFactory.java PortletCacheEntryFactory.java
PortletDefinitionCacheEntryFactory.java SiteModelManager.java
StyleSheetCacheEntryFactory.java ViewCacheEntryFactory.java
Added Files:
BlockingCacheManager.java SelfPopulatingCacheManager.java
Log Message:
CMSC-1302 Update CMSc to use a lastest stable version of EHCache
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement
See also: http://www.mmbase.org/jira/browse/CMSC-1302
BlockingCacheManager.java is new
SelfPopulatingCacheManager.java is new
Index: LayoutCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/LayoutCacheEntryFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- LayoutCacheEntryFactory.java 25 Jul 2008 15:54:03 -0000 1.9
+++ LayoutCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.10
@@ -9,9 +9,10 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
-
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.Relation;
+import org.mmbase.bridge.RelationIterator;
+import org.mmbase.bridge.RelationList;
import com.finalist.cmsc.beans.MMBaseNodeMapper;
import com.finalist.cmsc.beans.om.Layout;
@@ -25,7 +26,7 @@
@Override
- protected Serializable loadEntry(Serializable key) throws Exception {
+ protected Object loadEntry(Object key) throws Exception {
Node layoutNode = getNode(key);
if (layoutNode == null || !PagesUtil.isLayout(layoutNode)) {
return null;
Index: MMBaseCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MMBaseCacheEntryFactory.java 9 Jun 2008 21:23:24 -0000 1.5
+++ MMBaseCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.6
@@ -11,6 +11,7 @@
import java.io.Serializable;
+import net.sf.ehcache.Element;
import net.sf.ehcache.constructs.blocking.CacheEntryFactory;
import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
@@ -40,7 +41,7 @@
}
- protected abstract Serializable loadEntry(Serializable key) throws
Exception;
+ protected abstract Object loadEntry(Object key) throws Exception;
protected final void registerListener(String nodeType) {
@@ -48,12 +49,12 @@
}
- public Serializable createEntry(Serializable key) throws Exception {
+ public Object createEntry(Object key) throws Exception {
return loadEntry(key);
}
- protected Node getNode(Serializable key) {
+ protected Node getNode(Object key) {
if (key == null) {
return null;
}
@@ -99,7 +100,7 @@
public void refreshEntry(final Serializable key) {
try {
if (cache.getKeys().contains(key)) {
- cache.put(key, null);
+ cache.put(new Element(key, null));
cache.get(key);
}
}
@@ -111,7 +112,7 @@
public void deleteEntry(final Serializable key) {
try {
- cache.put(key, null);
+ cache.put(new Element(key, null));
}
catch (Exception e) {
log.debug("Failed to delete " + key + ":" + e.getMessage(), e);
Index: NavigationCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/NavigationCacheEntryFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NavigationCacheEntryFactory.java 27 Aug 2008 14:56:02 -0000 1.6
+++ NavigationCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.7
@@ -9,15 +9,18 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
import java.util.List;
import org.mmbase.bridge.Node;
-import org.mmbase.core.event.*;
+import org.mmbase.core.event.Event;
+import org.mmbase.core.event.NodeEvent;
+import org.mmbase.core.event.RelationEvent;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.navigation.*;
+import com.finalist.cmsc.navigation.NavigationItemManager;
+import com.finalist.cmsc.navigation.NavigationManager;
+import com.finalist.cmsc.navigation.PagesUtil;
public class NavigationCacheEntryFactory extends MMBaseCacheEntryFactory {
@@ -43,7 +46,7 @@
@Override
- protected Serializable loadEntry(Serializable key) throws Exception {
+ protected Object loadEntry(Object key) throws Exception {
Node node = getNode(key);
if (node == null) {
log.debug("NavigationItem not found: " + key);
Index: PortletCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/PortletCacheEntryFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- PortletCacheEntryFactory.java 25 Jul 2008 15:54:04 -0000 1.9
+++ PortletCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.10
@@ -9,16 +9,18 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
-
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeIterator;
+import org.mmbase.bridge.NodeList;
import org.mmbase.core.event.NodeEvent;
import org.mmbase.core.event.RelationEvent;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.beans.MMBaseNodeMapper;
-import com.finalist.cmsc.beans.om.*;
+import com.finalist.cmsc.beans.om.NodeParameter;
+import com.finalist.cmsc.beans.om.Portlet;
+import com.finalist.cmsc.beans.om.PortletParameter;
import com.finalist.cmsc.navigation.PortletUtil;
public class PortletCacheEntryFactory extends MMBaseCacheEntryFactory {
@@ -35,7 +37,7 @@
@Override
- protected Serializable loadEntry(Serializable key) {
+ protected Object loadEntry(Object key) {
return loadPortlet((Integer) key);
}
Index: PortletDefinitionCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/PortletDefinitionCacheEntryFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- PortletDefinitionCacheEntryFactory.java 25 Jul 2008 15:54:04 -0000
1.7
+++ PortletDefinitionCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000
1.8
@@ -9,10 +9,11 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
import java.util.List;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeIterator;
+import org.mmbase.bridge.NodeList;
import com.finalist.cmsc.beans.MMBaseNodeMapper;
import com.finalist.cmsc.beans.om.PortletDefinition;
@@ -26,7 +27,7 @@
@Override
- protected Serializable loadEntry(Serializable key) throws Exception {
+ protected Object loadEntry(Object key) throws Exception {
Node definitionNode = getNode(key);
if (definitionNode == null || !PortletUtil.isDefinition(definitionNode))
{
return null;
Index: SiteModelManager.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SiteModelManager.java 16 May 2008 11:46:35 -0000 1.12
+++ SiteModelManager.java 20 Apr 2009 09:54:12 -0000 1.13
@@ -9,16 +9,26 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import com.finalist.cmsc.beans.om.*;
-
-import net.sf.ehcache.CacheException;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCacheManager;
+import com.finalist.cmsc.beans.om.Layout;
+import com.finalist.cmsc.beans.om.NavigationItem;
+import com.finalist.cmsc.beans.om.Page;
+import com.finalist.cmsc.beans.om.Portlet;
+import com.finalist.cmsc.beans.om.PortletDefinition;
+import com.finalist.cmsc.beans.om.Site;
+import com.finalist.cmsc.beans.om.Stylesheet;
+import com.finalist.cmsc.beans.om.View;
public class SiteModelManager extends SelfPopulatingCacheManager {
@@ -108,7 +118,7 @@
public NavigationItem getNavigationItem(int id) {
try {
- return (NavigationItem) getCache(NAVIGATION_CACHE).get(id);
+ return (NavigationItem)
getCache(NAVIGATION_CACHE).get(id).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -122,7 +132,7 @@
try {
Integer itemId = siteCache.getSite(path);
if (itemId != null) {
- return (Site) getCache(NAVIGATION_CACHE).get(itemId);
+ return (Site)
getCache(NAVIGATION_CACHE).get(itemId).getObjectValue();
}
else {
log.debug("Site not found for path " + path);
@@ -146,7 +156,7 @@
try {
List<Integer> siteIds = siteCache.getSites();
for (Integer siteId : siteIds) {
- Site site = (Site) getCache(NAVIGATION_CACHE).get(siteId);
+ Site site = (Site)
getCache(NAVIGATION_CACHE).get(siteId).getObjectValue();
if (site != null) {
sites.add(site);
}
@@ -165,7 +175,7 @@
try {
List<Integer> itemIds = siteCache.getItemsForPath(path);
for (Integer itemId : itemIds) {
- NavigationItem item = (NavigationItem)
getCache(NAVIGATION_CACHE).get(itemId);
+ NavigationItem item = (NavigationItem)
getCache(NAVIGATION_CACHE).get(itemId).getObjectValue();
if (item != null && clazz.isInstance(item)) {
items.add(clazz.cast(item));
}
@@ -189,7 +199,7 @@
try {
List<Integer> itemIds = siteCache.getChildren(parent);
for (Integer itemId : itemIds) {
- NavigationItem navigationItem = (NavigationItem)
getCache(NAVIGATION_CACHE).get(itemId);
+ NavigationItem navigationItem = (NavigationItem)
getCache(NAVIGATION_CACHE).get(itemId).getObjectValue();
if (navigationItem != null &&
childClazz.isInstance(navigationItem)) {
items.add(childClazz.cast(navigationItem));
}
@@ -206,7 +216,7 @@
public View getView(int id) {
if (id > 0) {
try {
- return (View) getCache(VIEW_CACHE).get(Integer.valueOf(id));
+ return (View)
getCache(VIEW_CACHE).get(Integer.valueOf(id)).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -219,7 +229,7 @@
public Stylesheet getStylesheet(int id) {
if (id > 0) {
try {
- return (Stylesheet)
getCache(STYLESHEET_CACHE).get(Integer.valueOf(id));
+ return (Stylesheet)
getCache(STYLESHEET_CACHE).get(Integer.valueOf(id)).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -232,7 +242,7 @@
public Layout getLayout(int id) {
if (id > 0) {
try {
- return (Layout) getCache(LAYOUT_CACHE).get(Integer.valueOf(id));
+ return (Layout)
getCache(LAYOUT_CACHE).get(Integer.valueOf(id)).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -247,7 +257,7 @@
return selectDefinition;
}
try {
- return (PortletDefinition)
getCache(PORTLET_DEFINITION_CACHE).get(Integer.valueOf(id));
+ return (PortletDefinition)
getCache(PORTLET_DEFINITION_CACHE).get(Integer.valueOf(id)).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -265,7 +275,7 @@
return empty;
}
try {
- return (Portlet) getCache(PORTLET_CACHE).get(Integer.valueOf(id));
+ return (Portlet)
getCache(PORTLET_CACHE).get(Integer.valueOf(id)).getObjectValue();
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -382,7 +392,7 @@
public void clearPortlet(String portletId) {
try {
- getCache(PORTLET_CACHE).put(Integer.valueOf(portletId), null);
+ getCache(PORTLET_CACHE).put(new Element(portletId,null));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -397,7 +407,7 @@
public void clearItem(int itemId) {
try {
- getCache(NAVIGATION_CACHE).put(itemId, null);
+ getCache(NAVIGATION_CACHE).put(new Element(itemId, null));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
Index: StyleSheetCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/StyleSheetCacheEntryFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- StyleSheetCacheEntryFactory.java 25 Jul 2008 15:54:04 -0000 1.7
+++ StyleSheetCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.8
@@ -9,8 +9,6 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
-
import org.mmbase.bridge.Node;
import com.finalist.cmsc.beans.MMBaseNodeMapper;
@@ -25,7 +23,7 @@
@Override
- protected Serializable loadEntry(Serializable key) throws Exception {
+ protected Object loadEntry(Object key) throws Exception {
Node stylesheetNode = getNode(key);
if (stylesheetNode == null || !PagesUtil.isStylesheet(stylesheetNode)) {
return null;
Index: ViewCacheEntryFactory.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/ViewCacheEntryFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ViewCacheEntryFactory.java 25 Jul 2008 15:54:04 -0000 1.7
+++ ViewCacheEntryFactory.java 20 Apr 2009 09:54:12 -0000 1.8
@@ -9,7 +9,6 @@
*/
package com.finalist.cmsc.services.sitemanagement;
-import java.io.Serializable;
import java.util.List;
import org.mmbase.bridge.Node;
@@ -26,7 +25,7 @@
@Override
- protected Serializable loadEntry(Serializable key) throws Exception {
+ protected Object loadEntry(Object key) throws Exception {
Node viewNode = getNode(key);
if (viewNode == null || !PortletUtil.isView(viewNode)) {
return null;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
