SAK-26114 shortened url changes to use standard Sakai memory service …

…instead of ehcache-specific code git-svn-id: https://source.sakaiproject.org/svn/shortenedurl/trunk@308555 66ffb92e-73f9-0310-93c1-f5514f145a0a
yuyilin · Apr 23, 2014 · 7bfd65e · 7bfd65e
1 parent 7a32ae3
commit 7bfd65e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/shortenedurl/impl/src/java/org/sakaiproject/shortenedurl/impl/RandomisedUrlService.java b/shortenedurl/impl/src/java/org/sakaiproject/shortenedurl/impl/RandomisedUrlService.java
@@ -420,7 +420,7 @@ public void init() {
   		log.debug("Sakai RandomisedUrlService init().");
 
   		//setup cache
-  		cache = memoryService.newCache(CACHE_NAME);
+  		cache = memoryService.getCache(CACHE_NAME);
   	}
 
   	private ServerConfigurationService serverConfigurationService;

diff --git a/shortenedurl/pack/src/webapp/WEB-INF/components.xml b/shortenedurl/pack/src/webapp/WEB-INF/components.xml
@@ -78,22 +78,4 @@
 		<property name="serverConfigurationService" ref="org.sakaiproject.component.api.ServerConfigurationService" />
 	</bean>
 
-	<!--  Cache -->
-    <bean id="org.sakaiproject.shortenedurl.cache"
-        class="org.sakaiproject.memory.util.EhCacheFactoryBean">
-        <property name="cacheManager">
-            <ref bean="org.sakaiproject.memory.api.MemoryService.cacheManager"/>
-        </property>
-        <property name="cacheName">
-            <value>org.sakaiproject.shortenedurl.cache</value>
-        </property>
-        <property name="maxElementsInMemory" value="10000" />
-        <property name="diskPersistent" value="false" />
-        <property name="eternal" value="false" />
-        <property name="timeToLive" value="3600" />
-		<property name="timeToIdle" value="3600" />
-    </bean>
-
-
-
 </beans>