Merge pull request sakaiproject#1791 from buckett/KNL-1417

KNL-1417 Removed unused content cache.

kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java

@@ -231,9 +231,6 @@ public abstract class BaseContentService implements ContentHostingService, Cache
 	/** A Storage object for persistent storage. */
 	protected Storage m_storage = null;
 
-	/** A Cache for this service - ContentResource and ContentCollection keyed by reference. */
-	protected Cache m_cache = null;
-
 	/**
 	 * The quota for content resource body bytes (in Kbytes) for any hierarchy in the /user/ or /group/ areas, or 0 if quotas are not enforced.
 	 */
@@ -541,26 +538,6 @@ public void setUserDirectoryService(UserDirectoryService userDirectoryService) {
 		this.userDirectoryService = userDirectoryService;
 	}
 
-	/** Configuration: cache, or not. */
-	protected boolean m_caching = false;
-
-	/**
-	 * Configuration: cache, or not. 
-	 * 
-	 * @param value
-	 *        True/false
-	 */
-	public void setCaching(String value)
-	{
-		try
-		{
-			m_caching = Boolean.valueOf(value).booleanValue();
-		}
-		catch (Exception t)
-		{
-		}
-	}
-
 	/** Configuration: Do we protect attachments in sites with the site AuthZGroup. */
 	protected boolean m_siteAttachments = true; // Default to true for Sakai 2.5 and later
 
@@ -873,15 +850,6 @@ public void init()
 
 			M_log.info("Loaded Storage as "+m_storage+" for "+this);
 
-			// make the cache
-			if (m_caching)
-			{
-				m_cache = m_memoryService
-				.newCache(
-						"org.sakaiproject.content.api.ContentHostingService.cache",
-						this, getAccessPoint(true));
-			}
-
 			// register a transient notification for resources
 			NotificationEdit edit = m_notificationService.addTransientNotification();
 
@@ -974,11 +942,6 @@ public void destroy()
 		}
 		m_storage = null;
 
-		if ((m_caching) && (m_cache != null))
-		{
-			m_cache.close();
-		}
-
 		M_log.info("destroy()");
 
 	}