Author: ghuber
Date: Tue Jan 7 16:27:23 2014
New Revision: 1556264
URL: http://svn.apache.org/r1556264
Log:
Media file fixes.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java?rev=1556264&r1=1556263&r2=1556264&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
Tue Jan 7 16:27:23 2014
@@ -191,13 +191,14 @@ public class JPAMediaFileManagerImpl imp
MediaFileDirectory newDirectory = parentDirectory
.createNewDirectory(newDirName);
-
- // Refresh associated parent for changes
- strategy.refresh(parentDirectory);
// update weblog last modified date. date updated by saveWeblog()
roller.getWeblogManager().saveWeblog(newDirectory.getWeblog());
+ // Refresh associated parent for changes
+ roller.flush();
+ strategy.refresh(parentDirectory);
+
return newDirectory;
}
@@ -207,12 +208,12 @@ public class JPAMediaFileManagerImpl imp
public void createMediaFileDirectory(MediaFileDirectory directory)
throws WebloggerException {
this.strategy.store(directory);
-
- // Refresh associated parent for changes
- strategy.refresh(directory.getParent());
// update weblog last modified date. date updated by saveWebsite()
roller.getWeblogManager().saveWeblog(directory.getWeblog());
+
+ // Refresh associated parent for changes
+ strategy.refresh(directory.getParent());
}
/**
Modified:
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java?rev=1556264&r1=1556263&r2=1556264&view=diff
==============================================================================
---
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
(original)
+++
roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
Tue Jan 7 16:27:23 2014
@@ -70,7 +70,7 @@ public class MediaFileTest extends TestC
* Test creation of directory by path
*/
@Test
- public void ZtestCreateMediaFileDirectoryByPath() throws Exception {
+ public void testCreateMediaFileDirectoryByPath() throws Exception {
User testUser = null;
Weblog testWeblog = null;
@@ -181,7 +181,7 @@ public class MediaFileTest extends TestC
* Test directory creation
*/
@Test
- public void ZtestCreateMediaFileDirectory() throws Exception {
+ public void testCreateMediaFileDirectory() throws Exception {
User testUser = null;
Weblog testWeblog = null;
@@ -235,7 +235,7 @@ public class MediaFileTest extends TestC
/**
* Test getting list of all directories for a given user.
*/
- public void ZtestGetMediaFileDirectories() throws Exception {
+ public void testGetMediaFileDirectories() throws Exception {
User testUser = null;
Weblog testWeblog = null;
@@ -315,7 +315,7 @@ public class MediaFileTest extends TestC
/**
* Test deletion of media file
*/
- public void ZtestDeleteMediaFile() throws Exception {
+ public void testDeleteMediaFile() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser4");
@@ -389,7 +389,7 @@ public class MediaFileTest extends TestC
/**
* Test creation of media file.
*/
- public void ZtestCreateMediaFile() throws Exception {
+ public void testCreateMediaFile() throws Exception {
User testUser = null;
Weblog testWeblog = null;
@@ -448,7 +448,7 @@ public class MediaFileTest extends TestC
/**
* Test searching media file.
*/
- public void ZtestSearchMediaFile() throws Exception {
+ public void testSearchMediaFile() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser7");
@@ -672,7 +672,7 @@ public class MediaFileTest extends TestC
/**
* Test searching media file with paging logic.
*/
- public void ZtestSearchMediaFilePaging() throws Exception {
+ public void testSearchMediaFilePaging() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser9");
@@ -767,7 +767,7 @@ public class MediaFileTest extends TestC
/**
* Test searching media file with paging logic.
*/
- public void ZtestSearchMediaFileOrderBy() throws Exception {
+ public void testSearchMediaFileOrderBy() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser10");
@@ -860,7 +860,7 @@ public class MediaFileTest extends TestC
/**
* Test media file update
*/
- public void ZtestUpdateMediaFile() throws Exception {
+ public void testUpdateMediaFile() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser5");
@@ -931,7 +931,7 @@ public class MediaFileTest extends TestC
/**
* Test media file and directory gets
*/
- public void ZtestGetDirectoryContents() throws Exception {
+ public void testGetDirectoryContents() throws Exception {
User testUser = null;
Weblog testWeblog = null;
testUser = TestUtils.setupUser("mediaFileTestUser6");
@@ -1025,7 +1025,7 @@ public class MediaFileTest extends TestC
/**
* Test moving files across directories.
*/
- public void ZtestMoveDirectoryContents() throws Exception {
+ public void testMoveDirectoryContents() throws Exception {
User testUser = null;
Weblog testWeblog = null;
