Index: core-providers/pom.xml
===================================================================
--- core-providers/pom.xml	(revision 132790)
+++ core-providers/pom.xml	(working copy)
@@ -80,7 +80,13 @@
             <artifactId>sakai-kernel-util</artifactId>
         </dependency>
 <!-- -->
-
+        <!-- ehcache dependency -->
+		<dependency>
+			<groupId>${sakai.ehcache.groupId}</groupId>
+			<artifactId>${sakai.ehcache.artifactId}</artifactId>
+			<version>${sakai.ehcache.version}</version>
+			<scope>provided</scope>
+		</dependency>
         <!-- Pre K1 Sakai deps -->
 <!-- 
         <dependency>
Index: core-providers/src/java/cache.properties
===================================================================
--- core-providers/src/java/cache.properties	(revision 0)
+++ core-providers/src/java/cache.properties	(working copy)
@@ -0,0 +1,9 @@
+cache = A read only view of the cache information and statistics in the Sakai system
+cache.view.list = Retrieves the list of all caches with detailed cache statistics.
+cache.view.show = Retrieves a single cache with detailed cache statistics
+cache.action.cacheSummary = Retrieves the list of all caches with summarized cache statistics.
+cache.action.cacheNames = Retrieves the list of all cache names.
+cache.action.memory = Retrieves the current free, total, maximum jvm memory info
+cache.field.cacheHits = Included in cacheSummary
+cache.field.cacheSize = Included in cacheSummary
+cache.field.cacheHitRatio = Included in cacheSummary

Property changes on: core-providers/src/java/cache.properties
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: core-providers/src/java/org/sakaiproject/entitybroker/providers/CacheEntityProvider.java
===================================================================
--- core-providers/src/java/org/sakaiproject/entitybroker/providers/CacheEntityProvider.java	(revision 0)
+++ core-providers/src/java/org/sakaiproject/entitybroker/providers/CacheEntityProvider.java	(working copy)
@@ -0,0 +1,169 @@
+/**
+ * $Id$
+ * $URL$
+ **************************************************************************
+ * Copyright (c) 2008, 2009 The Sakai Foundation
+ *
+ * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.entitybroker.providers;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.TreeMap;
+
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Ehcache;
+
+import org.sakaiproject.entitybroker.EntityReference;
+import org.sakaiproject.entitybroker.EntityView;
+import org.sakaiproject.entitybroker.entityprovider.CoreEntityProvider;
+import org.sakaiproject.entitybroker.entityprovider.annotations.EntityCustomAction;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.ActionsExecutable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.CollectionResolvable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.Describeable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.Outputable;
+import org.sakaiproject.entitybroker.entityprovider.capabilities.Resolvable;
+import org.sakaiproject.entitybroker.entityprovider.extension.ActionReturn;
+import org.sakaiproject.entitybroker.entityprovider.extension.Formats;
+import org.sakaiproject.entitybroker.entityprovider.search.Search;
+import org.sakaiproject.entitybroker.providers.model.EntityCache;
+import org.sakaiproject.entitybroker.util.AbstractEntityProvider;
+
+/**
+ * CacheEntityProvider
+ *
+ * @author Earle Nietzel
+ * Created on Sep 11, 2013
+ * 
+ */
+public class CacheEntityProvider extends AbstractEntityProvider implements CoreEntityProvider,
+	ActionsExecutable, Outputable, Resolvable, Describeable, CollectionResolvable {
+
+	public final static String ENTITY_PREFIX = "cache";
+	
+	private CacheManager cacheManager;
+
+	/* (non-Javadoc)
+     * @see org.sakaiproject.entitybroker.entityprovider.EntityProvider#getEntityPrefix()
+     */
+	@Override
+	public String getEntityPrefix() {
+		return ENTITY_PREFIX;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.sakaiproject.entitybroker.entityprovider.CoreEntityProvider#entityExists(java.lang.String)
+	 */
+	@Override
+	public boolean entityExists(String id) {
+		Cache cache = cacheManager.getCache(id);
+		
+		if (cache != null) {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	@EntityCustomAction(action="memory",viewKey=EntityView.VIEW_LIST)
+	public Object getJvmMemoryStatus(EntityReference ref) {
+		TreeMap<String, String> status = new TreeMap<String, String>();
+
+		status.put("free", String.valueOf(Runtime.getRuntime().freeMemory()));
+		status.put("total", String.valueOf(Runtime.getRuntime().totalMemory()));
+		status.put("maximum", String.valueOf(Runtime.getRuntime().maxMemory()));
+
+		return new ActionReturn(status);
+	}
+
+	@EntityCustomAction(action="cacheNames",viewKey=EntityView.VIEW_LIST)
+	public Object getCacheNames(EntityReference ref) {
+		List<String> cacheNames = Arrays.asList(cacheManager.getCacheNames());
+		Collections.sort(cacheNames);
+		return new ActionReturn(cacheNames);
+	}
+
+	@EntityCustomAction(action="cacheSummary",viewKey=EntityView.VIEW_LIST)
+	public Object getCacheSummary(EntityReference ref) {
+		TreeMap<String, String> summary = new TreeMap<String, String>();
+		
+		for (Ehcache cache : getAllCaches()) {
+			EntityCache eCache = new EntityCache(cache);
+			summary.put(eCache.getId(), "Size " + eCache.getCacheSize() + ":Hits " + eCache.getCacheHits() + ":Ratio " + eCache.getCacheHitRatio());
+		}
+		
+		return new ActionReturn(summary);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.sakaiproject.entitybroker.entityprovider.capabilities.Outputable#getHandledOutputFormats()
+	 */
+	@Override
+	public String[] getHandledOutputFormats() {
+		return new String[] { Formats.XML, Formats.HTML, Formats.JSON };	
+	}
+
+	/* (non-Javadoc)
+	 * @see org.sakaiproject.entitybroker.entityprovider.capabilities.Resolvable#getEntity(org.sakaiproject.entitybroker.EntityReference)
+	 */
+	@Override
+	public Object getEntity(EntityReference ref) {
+		if (ref == null || ref.getId() == null) {
+			return new EntityCache();
+		}
+		
+		return new EntityCache(cacheManager.getCache(ref.getId()));
+	}
+
+	/* (non-Javadoc)
+	 * @see org.sakaiproject.entitybroker.entityprovider.capabilities.CollectionResolvable#getEntities(org.sakaiproject.entitybroker.EntityReference, org.sakaiproject.entitybroker.entityprovider.search.Search)
+	 */
+	@Override
+	public List<?> getEntities(EntityReference ref, Search search) {
+		List<EntityCache> caches = new ArrayList<EntityCache>();
+		
+		if (search.getRestrictionByProperty("id") != null) {
+        	String id = search.getRestrictionByProperty("id").getStringValue();
+        	
+        	if (entityExists(id)) {
+        		caches.add((EntityCache) getEntity(ref));
+        	}
+		} else {
+			for (Ehcache cache : getAllCaches()) {
+				caches.add(new EntityCache(cache));
+			}
+		}
+		
+		return caches;
+	}
+	
+	private List<Ehcache> getAllCaches()
+	{
+		final String[] cacheNames = cacheManager.getCacheNames();
+		Arrays.sort(cacheNames);
+		final List<Ehcache> caches = new ArrayList<Ehcache>(cacheNames.length);
+		for (String cacheName : cacheNames) {
+			caches.add(cacheManager.getEhcache(cacheName));
+		}
+		return caches;
+	}
+	
+	public void setCacheManager(CacheManager cacheManager) {
+		this.cacheManager = cacheManager;
+	}
+}

Property changes on: core-providers/src/java/org/sakaiproject/entitybroker/providers/CacheEntityProvider.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Author HeadURL Id
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityCache.java
===================================================================
--- core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityCache.java	(revision 0)
+++ core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityCache.java	(working copy)
@@ -0,0 +1,203 @@
+/**
+ * $Id$
+ * $URL$
+ **************************************************************************
+ * Copyright (c) 2008, 2009 The Sakai Foundation
+ *
+ * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.entitybroker.providers.model;
+
+import org.sakaiproject.entitybroker.entityprovider.annotations.EntityId;
+
+import net.sf.ehcache.Ehcache;
+import net.sf.ehcache.Statistics;
+
+/**
+ * EntityCache
+ *
+ * @author Earle Nietzel
+ * Created on Sep 11, 2013
+ * 
+ */
+public class EntityCache {
+
+    /**
+     * Fast but not accurate setting.
+     */
+    public static final int STATISTICS_ACCURACY_NONE = 0;
+
+    /**
+     * Best efforts accuracy setting.
+     */
+    public static final int STATISTICS_ACCURACY_BEST_EFFORT = 1;
+
+    /**
+     * Guaranteed accuracy setting.
+     */
+    public static final int STATISTICS_ACCURACY_GUARANTEED = 2;
+
+	@EntityId
+	private String id;
+
+    private String statisticsAccuracy;
+    private long cacheHits;
+    private long onDiskHits;
+    private long offHeapHits;
+    private long inMemoryHits;
+    private long cacheMisses;
+    private long onDiskMisses;
+    private long offHeapMisses;
+    private long inMemoryMisses;
+    private long cacheSize;
+    private long memoryStoreSize;
+    private long offHeapStoreSize;
+    private long diskStoreSize;
+    private float averageGetTime;
+    private long evictionCount;
+    private long searchesPerSecond;
+    private long averageSearchTime;
+    private long writerQueueLength;
+    private long cacheHitRatio;
+    private long diskHitRatio;
+    private long memoryHitRatio;
+    
+	public EntityCache() {
+	}
+	
+	public EntityCache(Ehcache cache) {
+		if (cache == null) {
+			throw new UnsupportedOperationException();
+		}
+		Statistics stats = cache.getStatistics();
+		
+		this.id = cache.getName();
+		
+		this.cacheHits = stats.getCacheHits();
+		this.onDiskHits = stats.getOnDiskHits(); 
+		this.offHeapHits = stats.getOffHeapHits(); 
+		this.inMemoryHits =	stats.getInMemoryHits();
+		this.cacheMisses = stats.getCacheMisses();
+		this.onDiskMisses = stats.getOnDiskMisses(); 
+		this.offHeapMisses = stats.getOffHeapMisses(); 
+		this.inMemoryMisses = stats.getInMemoryMisses(); 
+		this.cacheSize = stats.getObjectCount();
+		this.averageGetTime = stats.getAverageGetTime(); 
+		this.evictionCount = stats.getEvictionCount();
+		this.memoryStoreSize = stats.getMemoryStoreObjectCount(); 
+		this.offHeapStoreSize = stats.getOffHeapStoreObjectCount(); 
+		this.diskStoreSize = stats.getDiskStoreObjectCount();
+		this.searchesPerSecond = stats.getSearchesPerSecond();
+		this.averageSearchTime = stats.getAverageSearchTime();
+		this.writerQueueLength = stats.getWriterQueueSize();
+		this.cacheHitRatio = (cacheHits + cacheMisses) > 0 ? (100L * cacheHits) / (cacheHits + cacheMisses) : 0;
+		this.diskHitRatio = (onDiskHits + onDiskMisses) > 0 ? (100L * this.onDiskHits) / (onDiskHits + onDiskMisses) : 0;
+		this.memoryHitRatio = (inMemoryHits + inMemoryMisses) > 0 ? (100L * this.inMemoryHits) / (inMemoryHits + inMemoryMisses) : 0;
+		
+		switch(stats.getStatisticsAccuracy()) {
+			case STATISTICS_ACCURACY_NONE: 			this.statisticsAccuracy = "none"; break;
+			case STATISTICS_ACCURACY_BEST_EFFORT: 	this.statisticsAccuracy = "best effort"; break;
+			case STATISTICS_ACCURACY_GUARANTEED: 	this.statisticsAccuracy = "guarunteed"; break;
+			default: this.statisticsAccuracy = "unknown";
+		}
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getStatisticsAccuracy() {
+		return statisticsAccuracy;
+	}
+
+	public long getCacheHits() {
+		return cacheHits;
+	}
+
+	public long getOnDiskHits() {
+		return onDiskHits;
+	}
+
+	public long getOffHeapHits() {
+		return offHeapHits;
+	}
+
+	public long getInMemoryHits() {
+		return inMemoryHits;
+	}
+
+	public long getCacheMisses() {
+		return cacheMisses;
+	}
+
+	public long getOnDiskMisses() {
+		return onDiskMisses;
+	}
+
+	public long getOffHeapMisses() {
+		return offHeapMisses;
+	}
+
+	public long getInMemoryMisses() {
+		return inMemoryMisses;
+	}
+
+	public long getCacheSize() {
+		return cacheSize;
+	}
+
+	public long getMemoryStoreSize() {
+		return memoryStoreSize;
+	}
+
+	public long getOffHeapStoreSize() {
+		return offHeapStoreSize;
+	}
+
+	public long getDiskStoreSize() {
+		return diskStoreSize;
+	}
+
+	public float getAverageGetTime() {
+		return averageGetTime;
+	}
+
+	public long getEvictionCount() {
+		return evictionCount;
+	}
+
+	public long getSearchesPerSecond() {
+		return searchesPerSecond;
+	}
+
+	public long getAverageSearchTime() {
+		return averageSearchTime;
+	}
+
+	public long getWriterQueueLength() {
+		return writerQueueLength;
+	}
+
+	public long getCacheHitRatio() {
+		return cacheHitRatio;
+	}
+
+	public long getDiskHitRatio() {
+		return diskHitRatio;
+	}
+
+	public long getMemoryHitRatio() {
+		return memoryHitRatio;
+	}
+}

Property changes on: core-providers/src/java/org/sakaiproject/entitybroker/providers/model/EntityCache.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Revision Author HeadURL Id
\ No newline at end of property
Index: core-providers/src/webapp/WEB-INF/applicationContext.xml
===================================================================
--- core-providers/src/webapp/WEB-INF/applicationContext.xml	(revision 132790)
+++ core-providers/src/webapp/WEB-INF/applicationContext.xml	(working copy)
@@ -49,4 +49,10 @@
             class="org.sakaiproject.entitybroker.providers.ToolEntityProvider">
         <property name="toolManager" ref="org.sakaiproject.tool.api.ToolManager" />
     </bean>
+
+	<bean parent="org.sakaiproject.entitybroker.entityprovider.AbstractEntityProvider"
+		class="org.sakaiproject.entitybroker.providers.CacheEntityProvider">
+		<property name="developerHelperService"	ref="org.sakaiproject.entitybroker.DeveloperHelperService" />
+		<property name="cacheManager" ref="org.sakaiproject.memory.api.MemoryService.cacheManager" />
+	</bean>
 </beans>