Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r39dcd86ca435bd8205fcdeb0cf6969a24cae0a96 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 870373d635bc769aee2dc271e6ff12818fcfcea6) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 39dcd86ca435bd8205fcdeb0cf6969a24cae0a96) @@ -1298,18 +1298,7 @@ /** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#generateUniqueContentFolder() */ public String generateUniqueContentFolder() throws FileUtilException, IOException { - String newUniqueContentFolderID = null; - Properties props = new Properties(); - - IdentifierGenerator uuidGen = new UUIDHexGenerator(); - ( (Configurable) uuidGen).configure(Hibernate.STRING, props, null); - - // lowercase to resolve OS issues - newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase(); - - FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID); - - return flashMessage.serializeMessage(); + return FileUtil.generateUniqueContentFolder(); } /** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#getHelpURL() */ Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r39dcd86ca435bd8205fcdeb0cf6969a24cae0a96 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 39dcd86ca435bd8205fcdeb0cf6969a24cae0a96) @@ -22,11 +22,13 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.service; +import java.io.IOException; import java.util.Set; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.FileUtilException; /** @@ -55,4 +57,6 @@ public IToolVO getToolBySignature(final String toolSignature); public long getToolDefaultContentIdBySignature(final String toolSignature); + + public String generateUniqueContentFolder() throws FileUtilException, IOException; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r39dcd86ca435bd8205fcdeb0cf6969a24cae0a96 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 39dcd86ca435bd8205fcdeb0cf6969a24cae0a96) @@ -23,6 +23,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.service; +import java.io.IOException; import java.util.HashSet; import java.util.Set; @@ -34,6 +35,8 @@ import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.FileUtil; +import org.lamsfoundation.lams.util.FileUtilException; /** @@ -98,4 +101,10 @@ public void setToolSessionDAO(IToolSessionDAO toolSessionDAO) { this.toolSessionDAO = toolSessionDAO; } + + public String generateUniqueContentFolder() throws FileUtilException, IOException { + + return FileUtil.generateUniqueContentFolder(); + + } } Index: lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java =================================================================== diff -u -r9a123141df4cdf18fefb239b7d4c50e9d488d42d -r39dcd86ca435bd8205fcdeb0cf6969a24cae0a96 --- lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision 9a123141df4cdf18fefb239b7d4c50e9d488d42d) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java (.../FileUtil.java) (revision 39dcd86ca435bd8205fcdeb0cf6969a24cae0a96) @@ -32,11 +32,17 @@ import java.net.URLEncoder; import java.nio.channels.FileChannel; import java.util.Date; +import java.util.Properties; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.hibernate.Hibernate; +import org.hibernate.id.Configurable; +import org.hibernate.id.IdentifierGenerator; +import org.hibernate.id.UUIDHexGenerator; +import org.lamsfoundation.lams.util.wddx.FlashMessage; import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; import javax.mail.internet.MimeUtility; @@ -587,4 +593,21 @@ return filename; } + + /** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#generateUniqueContentFolder() */ + public static String generateUniqueContentFolder() throws FileUtilException, IOException { + + String newUniqueContentFolderID = null; + Properties props = new Properties(); + + IdentifierGenerator uuidGen = new UUIDHexGenerator(); + ( (Configurable) uuidGen).configure(Hibernate.STRING, props, null); + + // lowercase to resolve OS issues + newUniqueContentFolderID = ((String) uuidGen.generate(null, null)).toLowerCase(); + + FlashMessage flashMessage = new FlashMessage("createUniqueContentFolder", newUniqueContentFolderID); + + return flashMessage.serializeMessage(); + } }