You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/05/28 04:01:37 UTC
svn commit: r1597918 - in /roller/trunk/app/src:
main/java/org/apache/roller/weblogger/business/
main/java/org/apache/roller/weblogger/business/jpa/
main/java/org/apache/roller/weblogger/business/themes/
main/java/org/apache/roller/weblogger/pojos/ mai...
Author: gmazza
Date: Wed May 28 02:01:36 2014
New Revision: 1597918
URL: http://svn.apache.org/r1597918
Log:
Removal of path property from MediaFileDirectory (Part of ROL-2005)
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAMediaFileManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
roller/trunk/app/src/main/resources/ApplicationResources.properties
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
roller/trunk/app/src/main/resources/sql/createdb.vm
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
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/MediaFileManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MediaFileManager.java Wed May 28 02:01:36 2014
@@ -88,9 +88,9 @@ public interface MediaFileManager {
MediaFileFilter filter) throws WebloggerException;
/**
- * Create root directory for media files in a weblog.
+ * Create default folder for media files in a weblog.
*/
- MediaFileDirectory createRootMediaFileDirectory(Weblog weblog)
+ MediaFileDirectory createDefaultMediaFileDirectory(Weblog weblog)
throws WebloggerException;
/**
@@ -109,8 +109,8 @@ public interface MediaFileManager {
/**
* Create a media file directory given its path
*/
- MediaFileDirectory createMediaFileDirectoryByPath(Weblog weblog,
- String path) throws WebloggerException;
+ MediaFileDirectory createMediaFileDirectoryByName(Weblog weblog,
+ String name) throws WebloggerException;
/**
* Get media file directory by id
@@ -121,11 +121,11 @@ public interface MediaFileManager {
/**
* Get media file directory by its path
*/
- MediaFileDirectory getMediaFileDirectoryByPath(Weblog weblog,
- String path) throws WebloggerException;
+ MediaFileDirectory getMediaFileDirectoryByName(Weblog weblog,
+ String name) throws WebloggerException;
/**
- * Get media file by path.
+ * Get media file by directory path (single folder + file name).
*/
MediaFile getMediaFileByPath(Weblog weblog, String path)
throws WebloggerException;
@@ -144,9 +144,9 @@ public interface MediaFileManager {
throws WebloggerException;
/**
- * Get the root directory for media files for the given weblog.
+ * Get the default folder for media files for the given weblog.
*/
- MediaFileDirectory getMediaFileRootDirectory(Weblog weblog)
+ MediaFileDirectory getDefaultMediaFileDirectory(Weblog weblog)
throws WebloggerException;
/**
@@ -162,19 +162,6 @@ public interface MediaFileManager {
throws WebloggerException;
/**
- * Move a set of media files to a new directory.
- */
- void moveMediaFileDirectories(
- Collection<MediaFileDirectory> mediaFilesDir,
- MediaFileDirectory directory) throws WebloggerException;
-
- /**
- * Move one media file to a new directory.
- */
- void moveMediaFileDirectory(MediaFileDirectory mediaFileDir,
- MediaFileDirectory directory) throws WebloggerException;
-
- /**
* Return recently added media files that are public.
*/
List<MediaFile> fetchRecentPublicMediaFiles(int length)
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/MultiWeblogURLStrategy.java Wed May 28 02:01:36 2014
@@ -173,7 +173,7 @@ public class MultiWeblogURLStrategy exte
pathinfo.append(getWeblogURL(weblog, locale, absolute));
- String cat = null;
+ String cat;
if("root".equals(category)) {
cat = null;
} else {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/PreviewURLStrategy.java Wed May 28 02:01:36 2014
@@ -144,7 +144,7 @@ public class PreviewURLStrategy extends
pathinfo.append(locale).append("/");
}
- String cat = null;
+ String cat;
if("root".equals(category)) {
cat = null;
} else {
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=1597918&r1=1597917&r2=1597918&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 Wed May 28 02:01:36 2014
@@ -105,37 +105,6 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public void moveMediaFileDirectories(
- Collection<MediaFileDirectory> mediaFileDirs,
- MediaFileDirectory targetDir) throws WebloggerException {
-
- for (MediaFileDirectory mediaFileDir : mediaFileDirs) {
- // Refresh associated parent for changes
- strategy.refresh(mediaFileDir.getParent());
- mediaFileDir.setParent(targetDir);
- if ("/".equals(targetDir.getPath())) {
- mediaFileDir.setPath("/" + mediaFileDir.getName());
- } else {
- mediaFileDir.setPath(targetDir.getPath() + "/"
- + mediaFileDir.getName());
- }
- this.strategy.store(mediaFileDir);
- }
-
- // Refresh associated parent for changes
- roller.flush();
- strategy.refresh(targetDir);
- if (targetDir.getParent() != null) {
- strategy.refresh(targetDir.getParent());
- }
-
- // update weblog last modified date. date updated by saveWebsite()
- roller.getWeblogManager().saveWeblog(targetDir.getWeblog());
- }
-
- /**
- * {@inheritDoc}
- */
public void moveMediaFiles(Collection<MediaFile> mediaFiles,
MediaFileDirectory targetDirectory) throws WebloggerException {
@@ -175,14 +144,6 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public void moveMediaFileDirectory(MediaFileDirectory mediaFileDir,
- MediaFileDirectory targetDirectory) throws WebloggerException {
- moveMediaFileDirectories(Arrays.asList(mediaFileDir), targetDirectory);
- }
-
- /**
- * {@inheritDoc}
- */
public MediaFileDirectory createMediaFileDirectory(
MediaFileDirectory parentDirectory, String newDirName)
throws WebloggerException {
@@ -221,10 +182,10 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public MediaFileDirectory createMediaFileDirectoryByPath(Weblog weblog,
- String requestedPath) throws WebloggerException {
+ public MediaFileDirectory createMediaFileDirectoryByName(Weblog weblog,
+ String requestedName) throws WebloggerException {
- String path = requestedPath;
+ String path = requestedName;
log.debug("Creating dir: " + path);
if (path.startsWith("/")) {
@@ -235,19 +196,19 @@ public class JPAMediaFileManagerImpl imp
path = path.substring(0, path.length() - 1);
}
- if (path.equals("")) {
- // Root cannot be created using this method.
- // Use createRootMediaFileDirectory instead
- throw new WebloggerException("Invalid path!");
+ if (path.equals("") || path.equals("default")) {
+ // Default cannot be created using this method.
+ // Use createDefaultMediaFileDirectory instead
+ throw new WebloggerException("Invalid name!");
}
int lastPathIndex = path.lastIndexOf('/');
- MediaFileDirectory newDirectory = null;
+ MediaFileDirectory newDirectory;
if (lastPathIndex == -1) {
// Directory needs to be created under root
- MediaFileDirectory root = getMediaFileRootDirectory(weblog);
+ MediaFileDirectory root = getDefaultMediaFileDirectory(weblog);
if (root.hasDirectory(path)) {
throw new WebloggerException("Directory exists");
@@ -260,8 +221,8 @@ public class JPAMediaFileManagerImpl imp
boolean created = false;
- MediaFileDirectory base = getMediaFileRootDirectory(weblog);
- String token = null;
+ MediaFileDirectory base = getDefaultMediaFileDirectory(weblog);
+ String token;
String pathpart = "";
StringTokenizer toker = new StringTokenizer(path, "/");
while (toker.hasMoreTokens()) {
@@ -271,18 +232,18 @@ public class JPAMediaFileManagerImpl imp
} else {
pathpart += token;
}
- MediaFileDirectory possibleBase = getMediaFileDirectoryByPath(
+ MediaFileDirectory possibleBase = getMediaFileDirectoryByName(
weblog, pathpart);
if (possibleBase == null) {
base = base.createNewDirectory(token);
- log.debug(" Created new directory: " + base.getPath());
+ log.debug(" Created new directory: " + base.getName());
created = true;
roller.flush();
} else {
base = possibleBase;
}
}
- if (!created || !requestedPath.equals(base.getPath())) {
+ if (!created || !requestedName.equals(base.getName())) {
throw new WebloggerException("ERROR directory not created");
}
newDirectory = base;
@@ -297,12 +258,12 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public MediaFileDirectory createRootMediaFileDirectory(Weblog weblog)
+ public MediaFileDirectory createDefaultMediaFileDirectory(Weblog weblog)
throws WebloggerException {
- MediaFileDirectory rootDirectory = new MediaFileDirectory(null, "root",
- "root directory", weblog);
- createMediaFileDirectory(rootDirectory);
- return rootDirectory;
+ MediaFileDirectory defaultDirectory = new MediaFileDirectory(null, "default",
+ "default directory", weblog);
+ createMediaFileDirectory(defaultDirectory);
+ return defaultDirectory;
}
/**
@@ -340,7 +301,7 @@ public class JPAMediaFileManagerImpl imp
.getFileContentManager();
FileContent fc = cmgr.getFileContent(mediaFile.getWeblog(),
mediaFile.getId());
- BufferedImage img = null;
+ BufferedImage img;
img = ImageIO.read(fc.getInputStream());
@@ -462,17 +423,17 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public MediaFileDirectory getMediaFileDirectoryByPath(Weblog weblog,
- String path) throws WebloggerException {
+ public MediaFileDirectory getMediaFileDirectoryByName(Weblog weblog,
+ String name) throws WebloggerException {
- path = !path.startsWith("/") ? "/" + path : path;
+ name = name.startsWith("/") ? name.substring(1) : name;
- log.debug("Looking up weblog|path: " + weblog.getHandle() + "|" + path);
+ log.debug("Looking up weblog|media file directory: " + weblog.getHandle() + "|" + name);
Query q = this.strategy
- .getNamedQuery("MediaFileDirectory.getByWeblogAndPath");
+ .getNamedQuery("MediaFileDirectory.getByWeblogAndName");
q.setParameter(1, weblog);
- q.setParameter(2, path);
+ q.setParameter(2, name);
try {
return (MediaFileDirectory) q.getSingleResult();
} catch (NoResultException e) {
@@ -488,12 +449,12 @@ public class JPAMediaFileManagerImpl imp
// get directory
String fileName = path;
- MediaFileDirectory mdir = null;
+ MediaFileDirectory mdir;
int slash = path.lastIndexOf('/');
if (slash > 0) {
- mdir = getMediaFileDirectoryByPath(weblog, path.substring(0, slash));
+ mdir = getMediaFileDirectoryByName(weblog, path.substring(0, slash));
} else {
- mdir = getMediaFileRootDirectory(weblog);
+ mdir = getDefaultMediaFileDirectory(weblog);
}
if (slash != -1) {
fileName = fileName.substring(slash + 1);
@@ -519,7 +480,7 @@ public class JPAMediaFileManagerImpl imp
.getNamedQuery("MediaFile.getByWeblogAndOrigpath");
q.setParameter(1, weblog);
q.setParameter(2, origpath);
- MediaFile mf = null;
+ MediaFile mf;
try {
mf = (MediaFile) q.getSingleResult();
} catch (NoResultException e) {
@@ -545,7 +506,7 @@ public class JPAMediaFileManagerImpl imp
/**
* {@inheritDoc}
*/
- public MediaFileDirectory getMediaFileRootDirectory(Weblog weblog)
+ public MediaFileDirectory getDefaultMediaFileDirectory(Weblog weblog)
throws WebloggerException {
Query q = this.strategy
.getNamedQuery("MediaFileDirectory.getByWeblogAndNoParent");
@@ -792,10 +753,10 @@ public class JPAMediaFileManagerImpl imp
// create weblog's mediafile directory if
// needed
MediaFileDirectory root = this
- .getMediaFileRootDirectory(weblog);
+ .getDefaultMediaFileDirectory(weblog);
if (root == null) {
root = this
- .createRootMediaFileDirectory(weblog);
+ .createDefaultMediaFileDirectory(weblog);
roller.flush();
}
@@ -864,7 +825,7 @@ public class JPAMediaFileManagerImpl imp
} catch (WebloggerException ex) {
log.error("ERROR creating directory: "
- + newDir.getPath() + "/" + files[i].getName());
+ + newDir.getName() + "/" + files[i].getName());
}
upgradeUploadsDir(weblog, user, files[i], subDir);
}
@@ -878,10 +839,8 @@ public class JPAMediaFileManagerImpl imp
} else {
- String originalPath = ("/".equals(newDir.getPath()) ? ""
- : newDir.getPath()) + "/" + files[i].getName();
- log.debug(" Upgrade file with original path: "
- + originalPath);
+ String originalPath = "/" + newDir.getName() + "/" + files[i].getName();
+ log.debug("Upgrade file with original path: " + originalPath);
MediaFile mf = new MediaFile();
try {
@@ -933,12 +892,12 @@ public class JPAMediaFileManagerImpl imp
log.debug("Count of files created: " + fileCount);
} catch (WebloggerException ex) {
- log.error("ERROR flushing changes to dir: " + newDir.getPath(), ex);
+ log.error("ERROR flushing changes to dir: " + newDir.getName(), ex);
}
}
public void removeAllFiles(Weblog website) throws WebloggerException {
- removeMediaFileDirectory(getMediaFileRootDirectory(website));
+ removeMediaFileDirectory(getDefaultMediaFileDirectory(website));
}
public void removeMediaFileDirectory(MediaFileDirectory dir)
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Wed May 28 02:01:36 2014
@@ -336,7 +336,7 @@ public class JPAWeblogManagerImpl implem
}
}
- roller.getMediaFileManager().createRootMediaFileDirectory(newWeblog);
+ roller.getMediaFileManager().createDefaultMediaFileDirectory(newWeblog);
// flush so that all data up to this point can be available in db
this.strategy.flush();
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeManagerImpl.java Wed May 28 02:01:36 2014
@@ -204,7 +204,7 @@ public class ThemeManagerImpl implements
WeblogManager wmgr = roller.getWeblogManager();
MediaFileManager fileMgr = roller.getMediaFileManager();
- MediaFileDirectory root = fileMgr.getMediaFileRootDirectory(website);
+ MediaFileDirectory root = fileMgr.getDefaultMediaFileDirectory(website);
if (root == null) {
log.warn("Weblog " + website.getHandle()
+ " does not have a root MediaFile directory");
@@ -319,12 +319,12 @@ public class ThemeManagerImpl implements
log.debug("Importing resource " + resource.getPath());
if (resource.isDirectory()) {
- MediaFileDirectory mdir = fileMgr.getMediaFileDirectoryByPath(
+ MediaFileDirectory mdir = fileMgr.getMediaFileDirectoryByName(
website, resource.getPath());
if (mdir == null) {
log.debug(" Creating directory: " + resource.getPath());
mdir = fileMgr.createMediaFileDirectory(
- fileMgr.getMediaFileRootDirectory(website),
+ fileMgr.getDefaultMediaFileDirectory(website),
resource.getPath());
roller.flush();
} else {
@@ -339,7 +339,7 @@ public class ThemeManagerImpl implements
String justPath;
if (resourcePath.indexOf('/') == -1) {
- mdir = fileMgr.getMediaFileRootDirectory(website);
+ mdir = fileMgr.getDefaultMediaFileDirectory(website);
justPath = "";
justName = resourcePath;
@@ -351,11 +351,11 @@ public class ThemeManagerImpl implements
}
justName = resourcePath.substring(resourcePath
.lastIndexOf('/') + 1);
- mdir = fileMgr.getMediaFileDirectoryByPath(website,
+ mdir = fileMgr.getMediaFileDirectoryByName(website,
justPath);
if (mdir == null) {
log.debug(" Creating directory: " + justPath);
- mdir = fileMgr.createMediaFileDirectoryByPath(website,
+ mdir = fileMgr.createMediaFileDirectoryByName(website,
justPath);
roller.flush();
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFile.java Wed May 28 02:01:36 2014
@@ -318,7 +318,7 @@ public class MediaFile implements Serial
}
public String getPath() {
- return getDirectory().getPath();
+ return getDirectory().getName();
}
/**
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectory.java Wed May 28 02:01:36 2014
@@ -33,7 +33,6 @@ public class MediaFileDirectory {
String name;
String description;
Weblog weblog;
- String path;
MediaFileDirectory parent;
Set<MediaFileDirectory> childDirectories = new HashSet<MediaFileDirectory>();
Set<MediaFile> mediaFiles = new HashSet<MediaFile>();
@@ -50,15 +49,6 @@ public class MediaFileDirectory {
this.weblog = weblog;
this.parent = parent;
-
- // calculate path
- if (parent == null) {
- this.path = "/";
- } else if ("/".equals(parent.getPath())) {
- this.path = "/" + name;
- } else {
- this.path = parent.getPath() + "/" + name;
- }
}
public boolean isEmpty() {
@@ -130,18 +120,6 @@ public class MediaFileDirectory {
}
/**
- * The full path to this folder in the hierarchy.
- *
- */
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- /**
* The collection of files in this directory
*
*/
@@ -266,13 +244,12 @@ public class MediaFileDirectory {
MediaFileDirectory o = (MediaFileDirectory) other;
return new EqualsBuilder().append(getId(), o.getId())
.append(getName(), o.getName())
- .append(getDescription(), o.getDescription())
- .append(getPath(), o.getPath()).isEquals();
+ .append(getDescription(), o.getDescription()).isEquals();
}
public int hashCode() {
return new HashCodeBuilder().append(getId()).append(getName())
- .append(getDescription()).append(getPath()).toHashCode();
+ .append(getDescription()).toHashCode();
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/MediaFileDirectoryComparator.java Wed May 28 02:01:36 2014
@@ -33,7 +33,7 @@ public class MediaFileDirectoryComparato
* Comparator types that define all possible attributes for comparing media file directories.
*
*/
- public enum DirectoryComparatorType {NAME, PATH};
+ public enum DirectoryComparatorType {NAME};
// Comparator type associated with this instance of media directory comparator
DirectoryComparatorType type;
@@ -49,7 +49,6 @@ public class MediaFileDirectoryComparato
public int compare(MediaFileDirectory dir1, MediaFileDirectory dir2) {
switch (this.type) {
case NAME: return dir1.getName().compareTo(dir2.getName());
- case PATH: return dir1.getPath().compareTo(dir2.getPath());
default: return 0;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileAdd.java Wed May 28 02:01:36 2014
@@ -61,7 +61,7 @@ public class MediaFileAdd extends MediaF
private List<MediaFile> newFiles = new ArrayList<MediaFile>();
- private String directoryPath = null;
+ private String directoryName = null;
public MediaFileAdd() {
this.actionName = "mediaFileAdd";
@@ -81,19 +81,19 @@ public class MediaFileAdd extends MediaF
if (!StringUtils.isEmpty(bean.getDirectoryId())) {
setDirectory(mgr.getMediaFileDirectory(bean.getDirectoryId()));
- } else if (StringUtils.isNotEmpty(directoryPath)) {
- setDirectory(mgr.getMediaFileDirectoryByPath(getActionWeblog(),
- directoryPath));
+ } else if (StringUtils.isNotEmpty(directoryName)) {
+ setDirectory(mgr.getMediaFileDirectoryByName(getActionWeblog(),
+ directoryName));
} else {
MediaFileDirectory root = mgr
- .getMediaFileRootDirectory(getActionWeblog());
+ .getDefaultMediaFileDirectory(getActionWeblog());
if (root == null) {
- root = mgr.createRootMediaFileDirectory(getActionWeblog());
+ root = mgr.createDefaultMediaFileDirectory(getActionWeblog());
}
setDirectory(root);
}
- directoryPath = getDirectory().getPath();
+ directoryName = getDirectory().getName();
bean.setDirectoryId(getDirectory().getId());
} catch (WebloggerException ex) {
@@ -321,17 +321,17 @@ public class MediaFileAdd extends MediaF
}
/**
- * @return the directoryPath
+ * @return the directoryName
*/
- public String getDirectoryPath() {
- return directoryPath;
+ public String getDirectoryName() {
+ return directoryName;
}
/**
- * @param directoryPath
- * the directoryPath to set
+ * @param directoryName
+ * the directoryName to set
*/
- public void setDirectoryPath(String directoryPath) {
- this.directoryPath = directoryPath;
+ public void setDirectoryName(String directoryName) {
+ this.directoryName = directoryName;
}
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileBase.java Wed May 28 02:01:36 2014
@@ -167,34 +167,11 @@ public class MediaFileBase extends UIAct
}
}
- int movedDirs = 0;
- if (dirIds != null && dirIds.length > 0) {
- log.debug("Processing move of " + dirIds.length
- + " media files directories.");
- MediaFileDirectory targetDirectory = manager
- .getMediaFileDirectory(this.selectedDirectory);
- for (String dirId : dirIds) {
- log.debug("Moving media file - " + dirId
- + " to directory - " + this.selectedDirectory);
- MediaFileDirectory mediaFileDir = manager
- .getMediaFileDirectory(dirId);
- if (mediaFileDir != null
- && !mediaFileDir.getId().equals(targetDirectory.getId())
- && !mediaFileDir.getParent().getId().equals(targetDirectory.getId())) {
- manager.moveMediaFileDirectory(mediaFileDir,targetDirectory);
- movedDirs++;
- }
- }
- }
-
// flush changes
WebloggerFactory.getWeblogger().flush();
WebloggerFactory.getWeblogger().release();
- if (movedFiles > 0 || movedDirs > 0) {
+ if (movedFiles > 0) {
addMessage("mediaFile.move.success");
- if (movedDirs > 0) {
- refreshAllDirectories();
- }
}
} catch (WebloggerException e) {
@@ -214,7 +191,7 @@ public class MediaFileBase extends UIAct
List<MediaFileDirectory> sortedDirList = new ArrayList<MediaFileDirectory>();
sortedDirList.addAll(directories);
Collections.sort(sortedDirList, new MediaFileDirectoryComparator(
- DirectoryComparatorType.PATH));
+ DirectoryComparatorType.NAME));
setAllDirectories(sortedDirList);
} catch (WebloggerException ex) {
log.error("Error looking up media file directories", ex);
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileImageChooser.java Wed May 28 02:01:36 2014
@@ -43,7 +43,7 @@ public class MediaFileImageChooser exten
private static Log log = LogFactory.getLog(MediaFileImageChooser.class);
private String directoryId;
- private String directoryPath;
+ private String directoryName;
private List<MediaFile> childFiles;
private MediaFileDirectory currentDirectory;
@@ -75,11 +75,11 @@ public class MediaFileImageChooser exten
MediaFileDirectory directory;
if (this.directoryId != null) {
directory = manager.getMediaFileDirectory(this.directoryId);
- } else if (this.directoryPath != null) {
- directory = manager.getMediaFileDirectoryByPath(getActionWeblog(), this.directoryPath);
+ } else if (this.directoryName != null) {
+ directory = manager.getMediaFileDirectoryByName(getActionWeblog(), this.directoryName);
this.directoryId = directory.getId();
} else {
- directory = manager.getMediaFileRootDirectory(getActionWeblog());
+ directory = manager.getDefaultMediaFileDirectory(getActionWeblog());
this.directoryId = directory.getId();
}
@@ -122,8 +122,7 @@ public class MediaFileImageChooser exten
public List<KeyValueObject> getCurrentDirectoryHierarchy() {
List<KeyValueObject> directoryHierarchy = new ArrayList<KeyValueObject>();
- directoryHierarchy.add(new KeyValueObject("/", "root"));
- String fullPath = this.currentDirectory.getPath();
+ String fullPath = "/" + this.currentDirectory.getName();
if (fullPath.length() > 1) {
String[] directoryNames = fullPath.substring(1).split("/");
String dirPath = "";
@@ -150,17 +149,17 @@ public class MediaFileImageChooser exten
}
/**
- * @return the directoryPath
+ * @return the directory name
*/
- public String getDirectoryPath() {
- return directoryPath;
+ public String getDirectoryName() {
+ return directoryName;
}
/**
- * @param directoryPath the directoryPath to set
+ * @param directoryName the directoryName to set
*/
- public void setDirectoryPath(String directoryPath) {
- this.directoryPath = directoryPath;
+ public void setDirectoryName(String directoryName) {
+ this.directoryName = directoryName;
}
/**
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MediaFileView.java Wed May 28 02:01:36 2014
@@ -50,7 +50,7 @@ public class MediaFileView extends Media
private static Log log = LogFactory.getLog(MediaFileView.class);
private String directoryId;
- private String directoryPath;
+ private String directoryName;
private String sortBy;
private String newDirectoryName;
@@ -136,7 +136,7 @@ public class MediaFileView extends Media
try {
log.debug("Creating new directory - " + this.newDirectoryName);
MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
- MediaFileDirectory parentDirectory = manager.getMediaFileRootDirectory(getActionWeblog());
+ MediaFileDirectory parentDirectory = manager.getDefaultMediaFileDirectory(getActionWeblog());
manager.createMediaFileDirectory(parentDirectory, this.newDirectoryName);
// flush changes
WebloggerFactory.getWeblogger().flush();
@@ -180,14 +180,14 @@ public class MediaFileView extends Media
if (StringUtils.isNotEmpty(this.directoryId)) {
directory = manager.getMediaFileDirectory(this.directoryId);
- } else if (StringUtils.isNotEmpty(this.directoryPath)) {
- directory = manager.getMediaFileDirectoryByPath(getActionWeblog(), this.directoryPath);
+ } else if (StringUtils.isNotEmpty(this.directoryName)) {
+ directory = manager.getMediaFileDirectoryByName(getActionWeblog(), this.directoryName);
} else {
- directory = manager.getMediaFileRootDirectory(getActionWeblog());
+ directory = manager.getDefaultMediaFileDirectory(getActionWeblog());
}
this.directoryId = directory.getId();
- this.directoryPath = directory.getPath();
+ this.directoryName = directory.getName();
this.childDirectories = new ArrayList<MediaFileDirectory>();
this.childDirectories.addAll(directory.getChildDirectories());
@@ -285,8 +285,7 @@ public class MediaFileView extends Media
public List<KeyValueObject> getCurrentDirectoryHierarchy() {
List<KeyValueObject> directoryHierarchy = new ArrayList<KeyValueObject>();
- directoryHierarchy.add(new KeyValueObject("/", "root"));
- String fullPath = this.currentDirectory.getPath();
+ String fullPath = "/" + this.currentDirectory.getName();
String dpath = "";
if (fullPath.length() > 1) {
String[] directoryNames = fullPath.substring(1).split("/");
@@ -324,7 +323,7 @@ public class MediaFileView extends Media
try {
MediaFileManager manager = WebloggerFactory.getWeblogger().getMediaFileManager();
if (directoryId != null) {
- log.debug("Deleting media file folder - " + directoryId + " (" + directoryPath + ")");
+ log.debug("Deleting media file folder - " + directoryId + " (" + directoryName + ")");
MediaFileDirectory mediaFileDir = manager.getMediaFileDirectory(directoryId);
mediaFileDir.getParent().removeChildDirectory(mediaFileDir);
manager.removeMediaFileDirectory(mediaFileDir);
@@ -340,9 +339,9 @@ public class MediaFileView extends Media
CacheManager.invalidate(getActionWeblog());
// re-route to default folder
- mediaFileDir = manager.getMediaFileRootDirectory(getActionWeblog());
+ mediaFileDir = manager.getDefaultMediaFileDirectory(getActionWeblog());
setDirectoryId(mediaFileDir.getId());
- setDirectoryPath(mediaFileDir.getPath());
+ setDirectoryName(mediaFileDir.getName());
} else {
log.error("(System error) No directory ID provided for media file folder delete.");
}
@@ -411,12 +410,12 @@ public class MediaFileView extends Media
this.currentDirectory = currentDirectory;
}
- public String getDirectoryPath() {
- return directoryPath;
+ public String getDirectoryName() {
+ return directoryName;
}
- public void setDirectoryPath(String path) {
- this.directoryPath = path;
+ public void setDirectoryName(String path) {
+ this.directoryName = path;
}
public String getSortBy() {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/MediaCollection.java Wed May 28 02:01:36 2014
@@ -123,7 +123,7 @@ public class MediaCollection {
}
MediaFileDirectory mdir =
- fileMgr.getMediaFileDirectoryByPath(website, justPath);
+ fileMgr.getMediaFileDirectoryByName(website, justPath);
if (mdir.hasMediaFile(fileName)) {
throw new AtomException("Duplicate file name");
@@ -279,13 +279,13 @@ public class MediaCollection {
feed.setAlternateLinks(Collections.singletonList(link));
MediaFileManager fmgr = roller.getMediaFileManager();
- MediaFileDirectory dir = null;
+ MediaFileDirectory dir;
if (StringUtils.isNotEmpty(path)) {
- log.debug("Fetching resource collection from weblog " + handle + " at path: " + path);
- dir = fmgr.getMediaFileDirectoryByPath(website, path);
+ log.debug("Fetching resource collection from weblog " + handle + " in folder: " + path);
+ dir = fmgr.getMediaFileDirectoryByName(website, path);
} else {
log.debug("Fetching root resource collection from weblog " + handle);
- dir = fmgr.getMediaFileRootDirectory(website);
+ dir = fmgr.getDefaultMediaFileDirectory(website);
}
Set<MediaFile> files = dir.getMediaFiles();
@@ -570,7 +570,7 @@ public class MediaCollection {
throw new IllegalArgumentException("contentType cannot be null");
}
- String fileName = null;
+ String fileName;
// Determine the extension based on the contentType. This is a hack.
// The info we need to map from contentType to file extension is in
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/atomprotocol/RollerAtomService.java Wed May 28 02:01:36 2014
@@ -117,8 +117,8 @@ public class RollerAtomService extends A
List<MediaFileDirectory> dirs = mgr.getMediaFileDirectories(weblog);
for (MediaFileDirectory dir : dirs) {
Collection uploadSubCol = new Collection(
- "Media Files: " + dir.getPath(), "text",
- atomURL + "/" + weblog.getHandle() + "/resources/" + dir.getPath());
+ "Media Files: " + dir.getName(), "text",
+ atomURL + "/" + weblog.getHandle() + "/resources/" + dir.getName());
uploadSubCol.setAccepts(uploadAccepts);
workspace.addCollection(uploadSubCol);
}
@@ -134,17 +134,19 @@ public class RollerAtomService extends A
* Build accept range by taking things that appear to be content-type rules
* from site's file-upload allowed extensions.
*/
- private List getAcceptedContentTypeRange() throws WebloggerException {
- List accepts = new ArrayList();
+ private List<String> getAcceptedContentTypeRange() throws WebloggerException {
+ List<String> accepts = new ArrayList<String>();
Weblogger roller = WebloggerFactory.getWeblogger();
Map config = roller.getPropertiesManager().getProperties();
String allows = ((RuntimeConfigProperty)config.get("uploads.types.allowed")).getValue();
String[] rules = StringUtils.split(StringUtils.deleteWhitespace(allows), ",");
- for (int i = 0; i < rules.length; i++) {
- if (rules[i].indexOf('/') == -1) {
- continue;
+ if (rules != null) {
+ for (String rule : rules) {
+ if (rule.indexOf('/') == -1) {
+ continue;
+ }
+ accepts.add(rule);
}
- accepts.add(rules[i]);
}
return accepts;
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/webservices/xmlrpc/MetaWeblogAPIHandler.java Wed May 28 02:01:36 2014
@@ -378,7 +378,7 @@ public class MetaWeblogAPIHandler extend
Weblogger roller = WebloggerFactory.getWeblogger();
MediaFileManager fmgr = roller.getMediaFileManager();
- MediaFileDirectory root = fmgr.getMediaFileRootDirectory(website);
+ MediaFileDirectory root = fmgr.getDefaultMediaFileDirectory(website);
// Try to save file
MediaFile mf = new MediaFile();
Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Wed May 28 02:01:36 2014
@@ -980,9 +980,8 @@ mediaFileImageChooser.title=Choose an im
mediaFileImageChooser.subtitle=Choose an image
mediaFileImageChooser.rootPageTip=Click to choose an image or click on a \
directory to enter it.
-mediaFileImageChooser.dirPageTip=Click to choose an image or click on a \
-directory to enter it. Use breadcrumb links above to return to a previous \
-directory.
+mediaFileImageChooser.dirPageTip=Click to choose an image or use the Switch to Folder \
+drop-down to move to another directory.
# -- Media File Add
@@ -1075,7 +1074,7 @@ to organize your files, and you do not h
URLs" when you move or rename files.
mediaFileView.dirPageTip=\
This is a media file folder. You can return to the default folder \
-by clicking the ''root'' link above.
+by using the Switch to Folder drop-down below.
mediaFileView.viewFolder=Switch to Folder
@@ -1128,7 +1127,7 @@ mediaFileView.filesTagged=Files with tag
mediaFileView.noFiles=No files in this folder.
-mediaFileView.path=Path:
+mediaFileView.folderName=Folder:
mediaFileView.reset=Reset
Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/MediaFileDirectory.orm.xml Wed May 28 02:01:36 2014
@@ -12,8 +12,8 @@
<named-query name="MediaFileDirectory.getByWeblogAndNoParent">
<query>SELECT d FROM MediaFileDirectory d WHERE d.weblog = ?1 AND d.parent IS NULL</query>
</named-query>
- <named-query name="MediaFileDirectory.getByWeblogAndPath">
- <query>SELECT d FROM MediaFileDirectory d WHERE d.weblog = ?1 AND d.path = ?2</query>
+ <named-query name="MediaFileDirectory.getByWeblogAndName">
+ <query>SELECT d FROM MediaFileDirectory d WHERE d.weblog = ?1 AND d.name = ?2</query>
</named-query>
<attributes>
<id name="id">
@@ -25,9 +25,6 @@
<basic name="description">
<column name="description" insertable="true" updatable="true" unique="false" nullable="true"/>
</basic>
- <basic name="path">
- <column name="path" insertable="true" updatable="true" unique="false" nullable="false"/>
- </basic>
<many-to-one name="weblog" target-entity="org.apache.roller.weblogger.pojos.Weblog">
<join-column name="websiteid" insertable="true" updatable="true" nullable="false"/>
</many-to-one>
Modified: roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm (original)
+++ roller/trunk/app/src/main/resources/sql/500-to-510-migration.vm Wed May 28 02:01:36 2014
@@ -37,9 +37,19 @@ delete from pingtarget where websiteid i
#dropIndex("pt_websiteid_fk" "pingtarget")
#dropColumn("pingtarget", "websiteid")
--- Removal of bookmark subfolders and renaming of default folder to 'default'
+-- Removal of bookmark subfolders and renaming of former root folder to 'default'
+-- If a folder with name 'default' already exists, rename it by adding its id to it.
+update folder set name = #concat("name" "id") where name = 'default';
update folder set name = 'default' where name = 'root' and parentid is null;
#dropColumn("folder" 'parentid')
#dropColumn("folder" 'path')
#dropColumn("folder" "description")
#dropColumn("bookmark" "weight")
+
+-- Removal of bookmark subfolders and renaming of former root folder to 'default'
+-- If a folder with name 'default' already exists, rename it by adding its id to it.
+update roller_mediafiledir set name = #concat("name" "id") where name = 'default';
+update roller_mediafiledir set name = 'default' where name = 'root' and parentid is null;
+#dropColumn("roller_mediafiledir", "path")
+-- #dropColumn("roller_mediafiledir", "parentid")
+
Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Wed May 28 02:01:36 2014
@@ -505,8 +505,7 @@ create table roller_mediafiledir (
name varchar(255) not null,
description varchar(255),
websiteid varchar(48) not null,
- parentid varchar(48),
- path varchar(255)
+ parentid varchar(48)
);
@@ -562,9 +561,6 @@ alter table roller_mediafiletag add cons
alter table roller_mediafiledir add constraint mf_websiteid_fk
foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
-alter table roller_mediafiledir add constraint mf_parentid_fk
- foreign key ( parentid ) references roller_mediafiledir( id ) $!db.ADDL_FK_PARAMS ;
-
-- newsfeed
alter table newsfeed add constraint nf_websiteid_fk
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAdd.jsp Wed May 28 02:01:36 2014
@@ -70,7 +70,7 @@
<s:form id="entry" action="mediaFileAdd!save" method="POST" enctype="multipart/form-data">
<s:hidden name="salt" />
<s:hidden name="weblog" />
- <s:hidden name="directoryPath" />
+ <s:hidden name="directoryName" />
<%-- ================================================================== --%>
<%-- Title, category, dates and other metadata --%>
@@ -118,7 +118,7 @@
<label for="status"><s:text name="mediaFileAdd.directory" /></label>
</td>
<td>
- <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="path" />
+ <s:select name="bean.directoryId" list="allDirectories" listKey="id" listValue="name" />
</td>
</tr>
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileAddSuccess.jsp Wed May 28 02:01:36 2014
@@ -161,7 +161,7 @@
<li>
<s:url id="mediaFileAddURL" action="mediaFileAdd">
<s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="directoryPath" value="%{directoryPath}" />
+ <s:param name="directoryName" value="%{directoryName}" />
</s:url>
<s:a href="%{mediaFileAddURL}">
<s:text name="mediaFileSuccess.addAnother" />
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileEdit.jsp Wed May 28 02:01:36 2014
@@ -166,7 +166,7 @@ $("#d_clip_button").ready(function() {
</td>
<td>
<s:select name="bean.directoryId" list="allDirectories"
- listKey="id" listValue="path" tabindex="5" />
+ listKey="id" listValue="name" tabindex="5" />
</td>
</tr>
@@ -192,7 +192,7 @@ $("#d_clip_button").ready(function() {
</td>
</tr>
- <!-- orginal path from base URL of ctx/resources/ -->
+ <!-- original path from base URL of ctx/resources/ -->
<% if (WebloggerConfig.getBooleanProperty("mediafile.originalPathEdit.enabled")) { %>
<tr>
<td class="originalPathLabel">
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileImageChooser.jsp Wed May 28 02:01:36 2014
@@ -61,7 +61,7 @@
<%-- Subtitle and folder path --%>
-<s:if test='currentDirectory.path.equals("/")'>
+<s:if test='currentDirectory.name.equals("default")'>
<p class="subtitle">
<s:text name="mediaFileImageChooser.subtitle" >
@@ -78,10 +78,10 @@
<s:else>
<p class="subtitle">
- <s:text name="mediaFileView.path"/> /
+ <s:text name="mediaFileView.folderName"/> /
<s:iterator id="directory" value="currentDirectoryHierarchy">
<s:url id="getDirectoryByPathUrl" action="mediaFileImageChooser">
- <s:param name="directoryPath" value="#directory.key" />
+ <s:param name="directoryName" value="#directory.key" />
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
<s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileSidebar.jsp Wed May 28 02:01:36 2014
@@ -30,7 +30,7 @@
<img src='<s:url value="/images/image_add.png"/>' border="0"alt="icon" />
<s:url id="mediaFileAddURL" action="mediaFileAdd">
<s:param name="weblog" value="%{actionWeblog.handle}" />
- <s:param name="directoryPath" value="%{directoryPath}" />
+ <s:param name="directoryName" value="%{directoryName}" />
</s:url>
<a href='<s:property escape="false" value="%{mediaFileAddURL}" />'
<s:if test="actionName.equals('mediaFileAdd')">style='font-weight:bold;'</s:if> >
Modified: roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp?rev=1597918&r1=1597917&r2=1597918&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp Wed May 28 02:01:36 2014
@@ -217,7 +217,7 @@
<%-- Subtitle and folder path --%>
-<s:if test='currentDirectory.path.equals("/")'>
+<s:if test='currentDirectory.name.equals("default")'>
<p class="subtitle">
<s:text name="mediaFileView.subtitle" >
@@ -291,11 +291,11 @@
<s:else>
<p class="subtitle">
- <s:text name="mediaFileView.path"/> /
+ <s:text name="mediaFileView.name"/> /
<s:iterator id="directory" value="currentDirectoryHierarchy">
<s:url id="getDirectoryByPathUrl" action="mediaFileView">
- <s:param name="directoryPath" value="#directory.key" />
+ <s:param name="directoryName" value="#directory.key" />
<s:param name="weblog" value="%{actionWeblog.handle}" />
</s:url>
<s:a href="%{getDirectoryByPathUrl}"><s:property value="#directory.value" /></s:a> /
@@ -332,7 +332,7 @@
<s:submit type="button" action="mediaFileView!view" key="mediaFileView.viewFolder" />
<%-- Folder to View combo-box --%>
- <s:select name="viewDirectoryId" list="allDirectories" listKey="id" listValue="path" />
+ <s:select name="viewDirectoryId" list="allDirectories" listKey="id" listValue="name" />
</s:if>
</span>
@@ -476,7 +476,7 @@
<div style="clear:left;"></div>
- <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'root' && !pager)">
+ <s:if test="(!pager && childFiles.size() > 0) || (pager && pager.items.size() > 0) || (currentDirectory.name != 'default' && !pager)">
<div class="control">
<span style="padding-left:7px">
@@ -490,10 +490,10 @@
<input id="moveButton" type="button"
value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()" />
- <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="path" />
+ <s:select id="moveTargetMenu" name="selectedDirectory" list="allDirectories" listKey="id" listValue="name" />
</s:if>
- <s:if test="currentDirectory.name != 'root' && !pager">
+ <s:if test="currentDirectory.name != 'default' && !pager">
<s:submit value="%{getText('mediaFileView.deleteFolder')}" action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/>
</s:if>
</span>
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=1597918&r1=1597917&r2=1597918&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 Wed May 28 02:01:36 2014
@@ -98,34 +98,28 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- // no need to create root directory, that is done automatically now
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
- // assertNotNull(rootDirectory.getId() != null);
-
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "");
+ mfMgr.createMediaFileDirectoryByName(testWeblog, "");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "/");
+ mfMgr.createMediaFileDirectoryByName(testWeblog, "default");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
MediaFileDirectory newDirectory1 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test1");
+ .createMediaFileDirectoryByName(testWeblog, "test1");
MediaFileDirectory newDirectory2 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test2/");
+ .createMediaFileDirectoryByName(testWeblog, "test2");
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -140,39 +134,14 @@ public class MediaFileTest extends TestC
// show throw error when creating directory that already exists
try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog, "test1");
+ mfMgr.createMediaFileDirectoryByName(testWeblog, "test1");
assertTrue(false);
} catch (WebloggerException e) {
assertTrue(true);
}
- MediaFileDirectory newDirectory3 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog, "/test1/test2");
TestUtils.endSession(true);
-
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- MediaFileDirectory newDirectory3ById = mfMgr
- .getMediaFileDirectory(newDirectory3.getId());
- assertEquals(newDirectory3, newDirectory3ById);
-
- MediaFileDirectory newDirectory4 = mfMgr
- .createMediaFileDirectoryByPath(testWeblog,
- "/test1/test2/test3");
- TestUtils.endSession(true);
-
- testWeblog = TestUtils.getManagedWebsite(testWeblog);
- MediaFileDirectory newDirectory4ById = mfMgr
- .getMediaFileDirectory(newDirectory4.getId());
- assertEquals(newDirectory4, newDirectory4ById);
-
- // show throw error when creating directory that already exists
- try {
- mfMgr.createMediaFileDirectoryByPath(testWeblog,
- "/test1/test2/test3");
- assertTrue(false);
- } catch (WebloggerException e) {
- assertTrue(true);
- }
TestUtils.endSession(true);
TestUtils.teardownWeblog(testWeblog.getId());
@@ -210,13 +179,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory directory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory directory = new MediaFileDirectory(null, "root",
- // "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(directory);
- // assertEquals("/", directory.getPath());
- // assertNotNull(directory.getId() != null);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -226,7 +189,7 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
assertEquals(directory, rootDirectory);
TestUtils.endSession(true);
@@ -250,11 +213,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
MediaFileDirectory directory2 = new MediaFileDirectory(rootDirectory,
"dir2", "directory 2", testWeblog);
@@ -273,9 +232,9 @@ public class MediaFileTest extends TestC
.getMediaFileDirectories(testWeblog);
assertNotNull(directories);
assertEquals(3, directories.size());
- assertTrue(containsPath(directories, "/"));
- assertTrue(containsPath(directories, "/dir2"));
- assertTrue(containsPath(directories, "/dir3"));
+ assertTrue(containsName(directories, "default"));
+ assertTrue(containsName(directories, "dir2"));
+ assertTrue(containsName(directories, "dir3"));
TestUtils.endSession(true);
TestUtils.teardownWeblog(testWeblog.getId());
@@ -288,10 +247,10 @@ public class MediaFileTest extends TestC
* a directory of given path.
*
*/
- private boolean containsPath(Collection<MediaFileDirectory> directories,
- String path) {
+ private boolean containsName(Collection<MediaFileDirectory> directories,
+ String name) {
for (MediaFileDirectory directory : directories) {
- if (path.equals(directory.getPath())) {
+ if (name.equals(directory.getName())) {
return true;
}
}
@@ -329,11 +288,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -394,8 +349,8 @@ public class MediaFileTest extends TestC
*/
public void testCreateMediaFile() throws Exception {
- User testUser = null;
- Weblog testWeblog = null;
+ User testUser;
+ Weblog testWeblog;
testUser = TestUtils.setupUser("mediaFileTestUser3");
testWeblog = TestUtils.setupWeblog("mediaFileTestWeblog3", testUser);
@@ -404,11 +359,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -462,7 +413,7 @@ public class MediaFileTest extends TestC
testWeblog = TestUtils.getManagedWebsite(testWeblog);
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
try {
@@ -570,10 +521,10 @@ public class MediaFileTest extends TestC
filter2.setName("test_home.jpg");
searchResults = mfMgr.searchMediaFiles(testWeblog, filter2);
assertFalse(searchResults.isEmpty());
- assertEquals(id2, ((MediaFile) searchResults.get(0)).getId());
- assertNotNull(((MediaFile) searchResults.get(0)).getDirectory());
- assertEquals("/", ((MediaFile) searchResults.get(0)).getDirectory()
- .getPath());
+ assertEquals(id2, (searchResults.get(0)).getId());
+ assertNotNull((searchResults.get(0)).getDirectory());
+ assertEquals("default", (searchResults.get(0)).getDirectory()
+ .getName());
MediaFileFilter filter3 = new MediaFileFilter();
filter3.setName("test_work.jpg");
@@ -687,12 +638,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
- // TestUtils.endSession(true);
+ .getDefaultMediaFileDirectory(testWeblog);
for (int i = 0; i < 15; i++) {
rootDirectory = mfMgr.getMediaFileDirectory(rootDirectory
@@ -781,11 +727,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -874,11 +816,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
TestUtils.endSession(true);
@@ -945,11 +883,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
-
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- // mfMgr.createMediaFileDirectory(rootDirectory);
+ .getDefaultMediaFileDirectory(testWeblog);
MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
"dir1", "directory 1", testWeblog);
@@ -1005,9 +939,9 @@ public class MediaFileTest extends TestC
Set<MediaFileDirectory> childDirectories = rootDirectory
.getChildDirectories();
assertEquals(3, childDirectories.size());
- assertTrue(containsPath(childDirectories, "/dir1"));
- assertTrue(containsPath(childDirectories, "/dir2"));
- assertTrue(containsPath(childDirectories, "/dir3"));
+ assertTrue(containsName(childDirectories, "dir1"));
+ assertTrue(containsName(childDirectories, "dir2"));
+ assertTrue(containsName(childDirectories, "dir3"));
Set<MediaFile> mediaFiles = rootDirectory.getMediaFiles();
assertEquals(2, mediaFiles.size());
@@ -1040,14 +974,10 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
try {
- // MediaFileDirectory rootDirectory = new MediaFileDirectory(null,
- // "root", "root d", testWeblog);
- //mfMgr.createMediaFileDirectory(rootDirectory);
-
MediaFileDirectory directory1 = new MediaFileDirectory(
rootDirectory, "dir1", "directory 1", testWeblog);
mfMgr.createMediaFileDirectory(directory1);
@@ -1077,8 +1007,7 @@ public class MediaFileTest extends TestC
mediaFile.setCopyrightText("test 7.1 copyright text");
mediaFile.setSharedForGallery(false);
mediaFile.setLength(4000);
- mediaFile
- .setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
+ mediaFile.setInputStream(getClass().getResourceAsStream(TEST_IMAGE));
mediaFile.setContentType("image/jpeg");
mfMgr.createMediaFile(testWeblog, mediaFile, new RollerMessages());
//rootDirectory.getMediaFiles().add(mediaFile);
@@ -1167,11 +1096,11 @@ public class MediaFileTest extends TestC
// now, let's check to see if migration was successful
MediaFileDirectory root1 = mgr
- .getMediaFileRootDirectory(testWeblog1);
+ .getDefaultMediaFileDirectory(testWeblog1);
assertNotNull("testblog1's mediafile dir exists", root1);
assertNotNull(mgr.getMediaFileByPath(testWeblog1, "/sub1/hawk.jpg"));
assertNotNull(mgr.getMediaFileByPath(testWeblog1,
- "/sub1/sub2/nasa.jpg"));
+ "/sub2/nasa.jpg"));
assertNotNull(mgr.getMediaFileByPath(testWeblog1,
"/roller50-prop.png"));
@@ -1179,7 +1108,7 @@ public class MediaFileTest extends TestC
"/sub1/hawk.jpg"));
MediaFileDirectory root2 = mgr
- .getMediaFileRootDirectory(testWeblog2);
+ .getDefaultMediaFileDirectory(testWeblog2);
assertNotNull("testblog2's mediafile dir exists", root2);
assertNotNull(root2.getMediaFile("amsterdam.jpg"));
assertNotNull(root2.getMediaFile("p47-thunderbolt.jpg"));
@@ -1223,7 +1152,7 @@ public class MediaFileTest extends TestC
// no need to create root directory, that is done automatically now
MediaFileDirectory rootDirectory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
MediaFileDirectory directory1 = new MediaFileDirectory(rootDirectory,
"dir1", "directory 1", testWeblog);
@@ -1255,7 +1184,7 @@ public class MediaFileTest extends TestC
// Using named query MediaFileDirectory.getByWeblogAndNoParent
MediaFileDirectory directory = mfMgr
- .getMediaFileRootDirectory(testWeblog);
+ .getDefaultMediaFileDirectory(testWeblog);
assertEquals(3, directory.getChildDirectories().size());
@@ -1269,7 +1198,7 @@ public class MediaFileTest extends TestC
directory = null;
// Using named query again MediaFileDirectory.getByWeblogAndNoParent
- directory = mfMgr.getMediaFileRootDirectory(testWeblog);
+ directory = mfMgr.getDefaultMediaFileDirectory(testWeblog);
// There should only be two, the database only has two.
assertEquals(2, directory.getChildDirectories().size());