Remove db4o cache and corresponding jars.

git-svn-id: https://svn.code.sf.net/p/subsonic/code/trunk@2784 104adb81-38d2-4886-885e-82898e39ce25
hamsterdog6 · Mar 6, 2012 · c26d29a · c26d29a
1 parent e778576
commit c26d29a
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 289 deletions.
diff --git a/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224-sources.jar b/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224-sources.jar
diff --git a/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224.jar b/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224.jar
diff --git a/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224.pom b/repo/com/db4o/db4o-all/8.0.224/db4o-all-8.0.224.pom
diff --git a/subsonic-main/TODO.TXT b/subsonic-main/TODO.TXT
@@ -33,7 +33,6 @@ TODO IN 4.7
 Elevation broken.
   Try with ProcessBuilder builder = new ProcessBuilder(new String[] { "cmd.exe", "/C", fileToExecute });
 Use proper IDs in rest api.
-Remove cache and corresponding jars.
 Why are there two instances of subsonic-service.exe?
 Make it work with 64-bit Java 7.  Problem with exe4j?
 Add REST method to get user details, including avatar.

diff --git a/subsonic-main/pom.xml b/subsonic-main/pom.xml
@@ -210,12 +210,6 @@
             <version>1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.db4o</groupId>
-            <artifactId>db4o-all</artifactId>
-            <version>8.0.224</version>
-        </dependency>
-
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache-core</artifactId>

diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/ajax/ChatService.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/ajax/ChatService.java
@@ -19,7 +19,6 @@
 package net.sourceforge.subsonic.ajax;
 
 import net.sourceforge.subsonic.Logger;
-import net.sourceforge.subsonic.domain.Cache;
 import net.sourceforge.subsonic.service.SecurityService;
 import net.sourceforge.subsonic.util.BoundedList;
 import org.apache.commons.lang.StringUtils;
@@ -50,26 +49,15 @@ public class ChatService {
     private static final int MAX_MESSAGES = 10;
     private static final long TTL_MILLIS = 3L * 24L * 60L * 60L * 1000L; // 3 days.
 
-    private LinkedList<Message> messages;
+    private final LinkedList<Message> messages = new BoundedList<Message>(MAX_MESSAGES);
     private SecurityService securityService;
-    private Cache chatCache;
 
     private long revision = System.identityHashCode(this);
 
     /**
      * Invoked by Spring.
      */
     public void init() {
-        try {
-            messages = chatCache.getValue(CACHE_KEY);
-            if (messages == null) {
-                messages = new BoundedList<Message>(MAX_MESSAGES);
-            }
-        } catch (Exception x) {
-            LOG.warn("Failed to re-create chat messages.", x);
-            messages = new BoundedList<Message>(MAX_MESSAGES);
-        }
-
         // Delete old messages every hour.
         ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
         Runnable runnable = new Runnable() {
@@ -102,14 +90,12 @@ public synchronized void doAddMessage(String message, HttpServletRequest request
         message = StringUtils.trimToNull(message);
         if (message != null && user != null) {
             messages.addFirst(new Message(message, user, new Date()));
-            chatCache.put(CACHE_KEY, messages);
             revision++;
         }
     }
 
     public synchronized void clearMessages() {
         messages.clear();
-        chatCache.put(CACHE_KEY, messages);
         revision++;
     }
 
@@ -128,10 +114,6 @@ public void setSecurityService(SecurityService securityService) {
         this.securityService = securityService;
     }
 
-    public void setChatCache(Cache chatCache) {
-        this.chatCache = chatCache;
-    }
-
     public static class Messages implements Serializable {
 
         private static final long serialVersionUID = -752602719879818165L;

diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/dao/CacheDao.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/dao/CacheDao.java
diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/domain/Cache.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/domain/Cache.java
diff --git a/subsonic-main/src/main/webapp/WEB-INF/applicationContext-cache.xml b/subsonic-main/src/main/webapp/WEB-INF/applicationContext-cache.xml
@@ -19,10 +19,4 @@
         <constructor-arg value="musicFileMemoryCache"/>
     </bean>
 
-    <bean id="chatCache" class="net.sourceforge.subsonic.domain.Cache">
-        <constructor-arg value="Chat messages"/>
-        <constructor-arg value="1"/>
-        <constructor-arg ref="cacheDao"/>
-    </bean>
-
 </beans>
diff --git a/subsonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml b/subsonic-main/src/main/webapp/WEB-INF/applicationContext-service.xml
@@ -46,8 +46,6 @@
         <property name="daoHelper" ref="daoHelper"/>
     </bean>
 
-    <bean id="cacheDao" class="net.sourceforge.subsonic.dao.CacheDao"/>
-
     <bean id="daoHelper" class="net.sourceforge.subsonic.dao.DaoHelper"/>
 
 
@@ -208,7 +206,6 @@
 
     <bean id="ajaxChatService" class="net.sourceforge.subsonic.ajax.ChatService" init-method="init">
         <property name="securityService" ref="securityService"/>
-        <property name="chatCache" ref="chatCache"/>
     </bean>
 
 </beans>