Author: fpunt
Date: 2009-11-18 11:44:30 +0100 (Wed, 18 Nov 2009)
New Revision: 39761
Added:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SelfPopulatingCacheManager.java
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java
CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.xml
CMSContainer/branches/b1_5/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.xml
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.xml
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.xml
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.xml
Log:
Releasing CMSc 1.5.13 (also needed some backfixing from 1.7 for the ehcache)
Added:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
(rev 0)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/BlockingCacheManager.java
2009-11-18 10:44:30 UTC (rev 39761)
@@ -0,0 +1,124 @@
+package com.finalist.cmsc.services.sitemanagement;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.constructs.blocking.BlockingCache;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class BlockingCacheManager {
+ private static final Log LOG =
LogFactory.getLog(BlockingCacheManager.class.getName());
+
+ /**
+ * A custom cache manager, in case the user does not
+ * want to use the default cache manager when
+ * creating custom caches.
+ */
+ private static CacheManager manager;
+
+ /**
+ * A map of BlockingCaches, keyed by cache name
+ */
+ protected final Map caches;
+
+
+ /**
+ * Empty Constructor
+ */
+ public BlockingCacheManager() {
+ caches = new HashMap();
+ }
+
+ /**
+ * Constructor that assigns the cache manager to use when
+ * creating caches.
+ */
+ public BlockingCacheManager(CacheManager mgr) {
+ manager = mgr;
+ caches = new HashMap();
+ }
+
+ /**
+ * Creates a cache.
+ */
+ public BlockingCache getCache(final String name) throws CacheException {
+ // Lookup the cache
+ BlockingCache blockingCache = (BlockingCache) caches.get(name);
+ if (blockingCache != null) {
+ return blockingCache;
+ }
+
+ // Create the cache
+ synchronized (this) {
+ if (manager == null) {
+ //blockingCache = new BlockingCache(new
CacheManager().getCache(name));
+ //Create single CacheManager instance
+ blockingCache = new
BlockingCache(CacheManager.create().getCache(name));
+ } else {
+ blockingCache = new BlockingCache(manager.getCache(name));
+ }
+
+ caches.put(name, blockingCache);
+ return blockingCache;
+ }
+ }
+
+ /**
+ * Drops the contents of all caches.
+ */
+ public void clearAll() throws CacheException {
+ final List cacheList = getCaches();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Removing all blocking caches");
+ }
+ for (int i = 0; i < cacheList.size(); i++) {
+ final BlockingCache cache = (BlockingCache) cacheList.get(i);
+ cache.removeAll();
+ }
+ }
+
+ /**
+ * Drops the contents of a named cache.
+ */
+ public void clear(final String name) throws CacheException {
+ final BlockingCache blockingCache = (BlockingCache) getCache(name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Clearing " + name);
+ }
+ blockingCache.removeAll();
+ }
+
+ /**
+ * Returns the EHCache Cache Manager used in creating Blocking Caches.
+ *
+ * @return The cache manager
+ */
+ protected CacheManager getCacheManager() {
+ return manager;
+ }
+
+ /**
+ * Sets the EHCache Cache Manager used in creating blocking caches.
+ *
+ * @param mgr The new manager to use
+ */
+ protected void setCacheManager(CacheManager mgr) {
+ manager = mgr;
+ }
+
+ /**
+ * Builds the set of caches.
+ * Returns a copy so that the monitor can be released.
+ */
+ private synchronized List getCaches() {
+ final ArrayList blockingCaches = new ArrayList();
+ blockingCaches.addAll(this.caches.values());
+ return blockingCaches;
+ }
+}
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/MMBaseCacheEntryFactory.java
2009-11-18 10:44:30 UTC (rev 39761)
@@ -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;
@@ -48,8 +49,8 @@
}
- public Serializable createEntry(Serializable key) throws Exception {
- return loadEntry(key);
+ public Object createEntry(Object key) throws Exception {
+ return loadEntry((Serializable)key);
}
@@ -99,7 +100,7 @@
public void refreshEntry(final Serializable key) {
try {
if (cache.getKeys().contains(key)) {
- cache.put(key, null);
+ cache.remove(key);
cache.get(key);
}
}
@@ -111,7 +112,7 @@
public void deleteEntry(final Serializable key) {
try {
- cache.put(key, null);
+ cache.remove(key);
}
catch (Exception e) {
log.debug("Failed to delete " + key + ":" + e.getMessage(), e);
Added:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SelfPopulatingCacheManager.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SelfPopulatingCacheManager.java
(rev 0)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SelfPopulatingCacheManager.java
2009-11-18 10:44:30 UTC (rev 39761)
@@ -0,0 +1,136 @@
+package com.finalist.cmsc.services.sitemanagement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sf.ehcache.CacheException;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Element;
+import net.sf.ehcache.constructs.blocking.CacheEntryFactory;
+import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
+import net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory;
+
+public abstract class SelfPopulatingCacheManager extends BlockingCacheManager {
+
+ /**
+ * Constructor. Caches are set up here.
+ */
+ public SelfPopulatingCacheManager() throws CacheException {
+ super();
+ setupCaches();
+ }
+
+ /**
+ * Constructor. Caches are set up here.
+ */
+ public SelfPopulatingCacheManager(CacheManager mgr) throws CacheException {
+ super(mgr);
+ setupCaches();
+ }
+
+ /**
+ * Gets a self-populating cache.
+ *
+ * @param name the name of the cache
+ * @throws CacheException If the cache does not exist.
+ */
+ public SelfPopulatingCache getSelfPopulatingCache(final String name) throws
CacheException {
+ // Create the cache
+ final SelfPopulatingCache cache = (SelfPopulatingCache)
caches.get(name);
+ if (cache == null) {
+ throw new CacheException("Cache " + name + " cannot be retrieved.
Please check ehcache.xml");
+ }
+ return cache;
+ }
+
+ /**
+ * Refreshes all caches.
+ */
+ public void refreshAll() throws Exception {
+ final List caches = getCaches();
+ for (int i = 0; i < caches.size(); i++) {
+ final SelfPopulatingCache cache = (SelfPopulatingCache)
caches.get(i);
+ cache.refresh();
+ }
+ }
+
+ /**
+ * Refreshes a SelfPopulatingCache. The cache will repopulate itself.
+ *
+ * @param name the name of the cace
+ * @throws CacheException
+ */
+ public void refresh(final String name) throws CacheException {
+ final SelfPopulatingCache cache = (SelfPopulatingCache)
getSelfPopulatingCache(name);
+ cache.refresh();
+ }
+
+ /**
+ * Refreshes a single entry in a SelfPopulatingCache.
+ * The old entry is discarded and then requested, causing it to be
populated.
+ * Note: Used by tests only, do not use in production.
+ */
+ public void refreshEntry(final String cacheName, final Element element)
throws Exception {
+ final SelfPopulatingCache cache = (SelfPopulatingCache)
getSelfPopulatingCache(cacheName);
+ cache.put(element);
+ cache.get(element.getObjectKey());
+ }
+
+ /**
+ * Creates a self-populating cache.
+ */
+ protected synchronized SelfPopulatingCache createSelfPopulatingCache(final
String name,
+ final
CacheEntryFactory factory) throws CacheException {
+ if (caches.containsKey(name)) {
+ throw new CacheException("A cache with name \"" + name + "\"
already exists.");
+ }
+
+ // Create the cache
+ SelfPopulatingCache cache = null;
+ cache = new SelfPopulatingCache(getCache(name), factory);
+ caches.put(name, cache);
+ return cache;
+ }
+
+ /**
+ * Creates a self-populating cache with an UpdatingCacheEntryFactory
+ */
+ protected synchronized SelfPopulatingCache
createUpdatingSelfPopulatingCache(final String name,
+ final UpdatingCacheEntryFactory factory) throws CacheException {
+ if (caches.containsKey(name)) {
+ throw new CacheException("A cache with name \"" + name + "\"
already exists.");
+ }
+
+ // Create the cache
+ SelfPopulatingCache cache = null;
+ cache = new SelfPopulatingCache(getCache(name), factory);
+ caches.put(name, cache);
+ return cache;
+ }
+
+ /**
+ * Builds the set of caches. Returns a copy so that the monitor can be
released.
+ */
+ protected synchronized List getCaches() {
+ final ArrayList caches = new ArrayList();
+ caches.addAll(this.caches.values());
+ return caches;
+ }
+
+ /**
+ * Sets up the caches used by the manager.
+ */
+ protected synchronized void setupCaches() throws CacheException {
+ doSetupCaches();
+ }
+
+ /**
+ * A template method to set up caches. It is wrapped by {...@link
#setupCaches}
+ * to ensure that caches are created within a synchronized method.
+ * <p/>
+ * Implementations of this method should typically call {...@link
#createSelfPopulatingCache(java.lang.String,
net.sf.ehcache.constructs.blocking.CacheEntryFactory)},
+ * or {...@link #createUpdatingSelfPopulatingCache(java.lang.String,
net.sf.ehcache.constructs.blocking.UpdatingCacheEntryFactory)}
+ * for each required cache.
+ */
+ protected abstract void doSetupCaches() throws CacheException;
+}
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/services/sitemanagement/SiteModelManager.java
2009-11-18 10:44:30 UTC (rev 39761)
@@ -18,7 +18,6 @@
import net.sf.ehcache.CacheException;
import net.sf.ehcache.constructs.blocking.SelfPopulatingCache;
-import net.sf.ehcache.constructs.blocking.SelfPopulatingCacheManager;
public class SiteModelManager extends SelfPopulatingCacheManager {
@@ -121,7 +120,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);
@@ -135,7 +134,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);
@@ -159,7 +158,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);
}
@@ -178,7 +177,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));
}
@@ -202,7 +201,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));
}
@@ -219,7 +218,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);
@@ -232,7 +231,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);
@@ -245,7 +244,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);
@@ -260,7 +259,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);
@@ -278,7 +277,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);
@@ -395,7 +394,7 @@
public void clearPortlet(String portletId) {
try {
- getCache(PORTLET_CACHE).put(Integer.valueOf(portletId), null);
+ getCache(PORTLET_CACHE).remove(Integer.valueOf(portletId));
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
@@ -410,7 +409,7 @@
public void clearItem(int itemId) {
try {
- getCache(NAVIGATION_CACHE).put(itemId, null);
+ getCache(NAVIGATION_CACHE).remove(itemId);
}
catch (CacheException e) {
log.info("" + e.getMessage(), e);
Modified: CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties
===================================================================
--- CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties
2009-11-18 10:21:23 UTC (rev 39760)
+++ CMSContainer/branches/b1_5/CMSContainer/maven-base/project.properties
2009-11-18 10:44:30 UTC (rev 39761)
@@ -7,7 +7,7 @@
maven.multiproject.type=mmbase-module
-cmsc.version=1.5.13-SNAPSHOT
+cmsc.version=1.5.13
mmbase.version=1.8.7-20090803
# maven build does not yet generate a rmmci. Did not create one by hand
Modified:
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.properties
2009-11-18 10:44:30 UTC (rev 39761)
@@ -5,11 +5,11 @@
# See http://www.MMBase.org/license
#
-application.version=1.5.13-SNAPSHOT
+application.version=1.5.13
-cmsc.version=1.5.13-SNAPSHOT
-cmscportlets.version=1.5.13-SNAPSHOT
-cmscmodules.version=1.5.13-SNAPSHOT
+cmsc.version=1.5.13
+cmscportlets.version=1.5.13
+cmscmodules.version=1.5.13
mmbase.version=1.8.7-20090803
# maven build does not yet generate a rmmci. Did not create one by hand
Modified:
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Demo/demo.cmscontainer.org/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -578,22 +578,13 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<properties>
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>${war.bundle}</war.bundle>
- </properties>
- </dependency>
<!-- Maven mmbase-modules plugin -->
<dependency>
Modified:
CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.xml
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Demo/i18n-demo/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -506,22 +506,13 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<properties>
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>${war.bundle}</war.bundle>
- </properties>
- </dependency>
<!-- Maven mmbase-modules plugin -->
<dependency>
Modified:
CMSContainer/branches/b1_5/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.xml
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -551,22 +551,13 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<properties>
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>${war.bundle}</war.bundle>
- </properties>
- </dependency>
<!-- Maven mmbase-modules plugin -->
<dependency>
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.properties
2009-11-18 10:44:30 UTC (rev 39761)
@@ -7,8 +7,8 @@
maven.multiproject.type=mmbase-module
-cmscmodules.version=1.5.13-SNAPSHOT
-cmsc.version=1.5.13-SNAPSHOT
+cmscmodules.version=1.5.13
+cmsc.version=1.5.13
mmbase.version=1.8.7-20090803
# maven build does not yet generate a rmmci. Did not create one by hand
Modified: CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.xml
===================================================================
--- CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++ CMSContainer/branches/b1_5/CMSContainer_Modules/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -442,22 +442,13 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<properties>
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>${war.bundle}</war.bundle>
- </properties>
- </dependency>
<!-- Java Mail -->
<dependency>
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.properties
2009-11-18 10:44:30 UTC (rev 39761)
@@ -7,8 +7,8 @@
maven.multiproject.type=mmbase-module
-cmscportlets.version=1.5.13-SNAPSHOT
-cmsc.version=1.5.13-SNAPSHOT
+cmscportlets.version=1.5.13
+cmsc.version=1.5.13
mmbase.version=1.8.7-20090803
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.xml
===================================================================
--- CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++ CMSContainer/branches/b1_5/CMSContainer_Portlets/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -442,22 +442,13 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
- <version>1.1</version>
+ <artifactId>ehcache-core</artifactId>
+ <version>1.7.0</version>
<type>jar</type>
<properties>
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
- <dependency>
- <groupId>ehcache</groupId>
- <artifactId>ehcache-constructs</artifactId>
- <version>0.6</version>
- <type>jar</type>
- <properties>
- <war.bundle>${war.bundle}</war.bundle>
- </properties>
- </dependency>
<!-- Java Mail -->
<dependency>
Modified:
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.properties
2009-11-18 10:44:30 UTC (rev 39761)
@@ -7,9 +7,9 @@
application.version=1.0-SNAPSHOT
-cmsc.version=1.5.12
-cmscportlets.version=1.5.12
-cmscmodules.version=1.5.12
+cmsc.version=1.5.13
+cmscportlets.version=1.5.13
+cmscmodules.version=1.5.13
mmbase.version=1.8.7-20090803
# maven build does not yet generate a rmmci. Did not create one by hand
Modified:
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.xml
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.xml
2009-11-18 10:21:23 UTC (rev 39760)
+++
CMSContainer/branches/b1_5/CMSContainer_Templates/single/maven-base/project.xml
2009-11-18 10:44:30 UTC (rev 39761)
@@ -527,7 +527,7 @@
<!-- EHcache used for cmsc sitemanagement -->
<dependency>
<groupId>ehcache</groupId>
- <artifactId>ehcache</artifactId>
+ <artifactId>ehcache-core</artifactId>
<version>1.7.0</version>
<type>jar</type>
<properties>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
