Author: ghuber
Date: Thu Feb 9 21:10:03 2012
New Revision: 1242523
URL: http://svn.apache.org/viewvc?rev=1242523&view=rev
Log:
Delete thumbnails and make sure files are stored in the correct location ie by
making sure the path expands correctly.
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Modified:
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=1242523&r1=1242522&r2=1242523&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
(original)
+++
roller/trunk/weblogger-business/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
Thu Feb 9 21:10:03 2012
@@ -494,6 +494,8 @@ public class JPAMediaFileManagerImpl imp
try {
cmgr.deleteFile(weblog, mediaFile.getId());
+ // Now thumbnail
+ cmgr.deleteFile(weblog, mediaFile.getId() + "_sm");
} catch (FileNotFoundException e) {
log.debug("File to be deleted already unavailable in the file
store");
}
Modified:
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1242523&r1=1242522&r2=1242523&view=diff
==============================================================================
---
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/weblogger-business/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Thu Feb 9 21:10:03 2012
@@ -672,7 +672,7 @@ log4j.logger.openjpa.jdbc.Schema=ERROR
# Values of the properties in this list get system property expansion
# applied to them when loaded.
-config.expandedProperties=uploads.dir,search.index.dir
+config.expandedProperties=uploads.dir,search.index.dir,mediafiles.storage.dir
# True to enable history in Atom feeds with next/prev links
site.newsfeeds.history.enabled=false
