Skip to content
Snippets Groups Projects
Commit 26e4239f authored by srosse's avatar srosse
Browse files

OO-1478: create the versions folder during import, double check if the 3 directories exists

parent a8c8c66b
No related branches found
No related tags found
No related merge requests found
...@@ -49,6 +49,7 @@ import org.olat.core.util.Formatter; ...@@ -49,6 +49,7 @@ import org.olat.core.util.Formatter;
import org.olat.core.util.vfs.VFSContainer; import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSItem; import org.olat.core.util.vfs.VFSItem;
import org.olat.core.util.vfs.VFSLeaf; import org.olat.core.util.vfs.VFSLeaf;
import org.olat.core.util.vfs.VFSManager;
import org.olat.core.util.vfs.filters.VFSLeafFilter; import org.olat.core.util.vfs.filters.VFSLeafFilter;
import org.olat.modules.wiki.gui.components.wikiToHtml.FilterUtil; import org.olat.modules.wiki.gui.components.wikiToHtml.FilterUtil;
import org.olat.modules.wiki.versioning.ChangeInfo; import org.olat.modules.wiki.versioning.ChangeInfo;
...@@ -82,9 +83,9 @@ public class Wiki implements WikiContainer, Serializable { ...@@ -82,9 +83,9 @@ public class Wiki implements WikiContainer, Serializable {
if(wikiRootContainer == null) throw new AssertException("null values are not allowed for the wiki constructor!"); if(wikiRootContainer == null) throw new AssertException("null values are not allowed for the wiki constructor!");
wikiPages = Collections.synchronizedMap(new HashMap<String, WikiPage>()); wikiPages = Collections.synchronizedMap(new HashMap<String, WikiPage>());
this.diffService = WikiManager.getInstance().getDiffService(); this.diffService = WikiManager.getInstance().getDiffService();
versionsContainer = (VFSContainer) wikiRootContainer.resolve(WikiManager.VERSION_FOLDER_NAME); versionsContainer = VFSManager.getOrCreateContainer(wikiRootContainer, WikiManager.VERSION_FOLDER_NAME);
pageContainer = (VFSContainer) wikiRootContainer.resolve(WikiManager.WIKI_RESOURCE_FOLDER_NAME); pageContainer = VFSManager.getOrCreateContainer(wikiRootContainer, WikiManager.WIKI_RESOURCE_FOLDER_NAME);
mediaContainer = (VFSContainer) wikiRootContainer.resolve(WikiContainer.MEDIA_FOLDER_NAME); mediaContainer = VFSManager.getOrCreateContainer(wikiRootContainer, WikiContainer.MEDIA_FOLDER_NAME);
} }
/** /**
......
...@@ -208,6 +208,8 @@ public class WikiManager { ...@@ -208,6 +208,8 @@ public class WikiManager {
Files.createDirectories(wikiDir); Files.createDirectories(wikiDir);
mediaDir = destDir.resolve(WikiContainer.MEDIA_FOLDER_NAME); mediaDir = destDir.resolve(WikiContainer.MEDIA_FOLDER_NAME);
Files.createDirectories(mediaDir); Files.createDirectories(mediaDir);
Path versionDir = destDir.resolve(VERSION_FOLDER_NAME);
Files.createDirectories(versionDir);
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment