From 4a59aba351648e6720d438b14023f36602232e61 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Fri, 23 Apr 2010 14:50:34 +0000 Subject: [PATCH] ALF-2549 - FixNameCrcValues attempts to create log in current directory. - now the log is created in a long life temp dir. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/admin/patch/impl/FixNameCrcValuesPatch.java | 11 ++++++++++- .../repo/admin/patch/impl/InvalidNameEndingPatch.java | 5 ++++- .../admin/patch/impl/LinkNodeFileExtensionPatch.java | 6 ++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java index 66c6147569..3a1fdffaee 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java @@ -31,6 +31,7 @@ import java.util.zip.CRC32; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.patch.AbstractPatch; +import org.alfresco.repo.admin.patch.PatchExecuter; import org.alfresco.repo.batch.BatchProcessor; import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorker; import org.alfresco.repo.domain.ChildAssoc; @@ -42,6 +43,9 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.service.cmr.admin.PatchException; import org.alfresco.service.cmr.rule.RuleService; import org.alfresco.service.namespace.QName; +import org.alfresco.util.TempFileProvider; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.hibernate.SQLQuery; import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; @@ -71,6 +75,8 @@ public class FixNameCrcValuesPatch extends AbstractPatch private QNameDAO qnameDAO; private RuleService ruleService; + private static Log progress_logger = LogFactory.getLog(PatchExecuter.class); + public FixNameCrcValuesPatch() { } @@ -140,7 +146,10 @@ public class FixNameCrcValuesPatch extends AbstractPatch private HibernateHelper() throws IOException { - logFile = new File("./FixNameCrcValuesPatch.log"); + // put the log file into a long life temp directory + File tempDir = TempFileProvider.getLongLifeTempDir("patches"); + logFile = new File(tempDir, "FixNameCrcValuesPatch.log"); + // open the file for appending RandomAccessFile outputFile = new RandomAccessFile(logFile, "rw"); channel = outputFile.getChannel(); diff --git a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java index d190163cd4..d0dd3a1320 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/InvalidNameEndingPatch.java @@ -34,6 +34,7 @@ import org.alfresco.repo.node.db.NodeDaoService; import org.alfresco.service.cmr.admin.PatchException; import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.util.TempFileProvider; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -121,7 +122,9 @@ public class InvalidNameEndingPatch extends AbstractPatch private HibernateHelper() throws IOException { - logFile = new File("./InvalidNameEndingPatch.log"); + File tempDir = TempFileProvider.getLongLifeTempDir("patches"); + logFile = new File(tempDir, "InvalidNameEndingPatch.log"); + // open the file for appending RandomAccessFile outputFile = new RandomAccessFile(logFile, "rw"); channel = outputFile.getChannel(); diff --git a/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java index 3b99b9f513..6c5d0e068b 100644 --- a/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java +++ b/source/java/org/alfresco/repo/admin/patch/impl/LinkNodeFileExtensionPatch.java @@ -33,6 +33,7 @@ import org.alfresco.repo.node.db.NodeDaoService; import org.alfresco.service.cmr.admin.PatchException; import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException; import org.alfresco.service.cmr.repository.NodeRef; +import org.alfresco.util.TempFileProvider; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -115,8 +116,9 @@ public class LinkNodeFileExtensionPatch extends AbstractPatch private HibernateHelper() throws IOException { // Open a log file - - logFile = new File("./LinkNodeExtensionPatch.log"); + File tempDir = TempFileProvider.getLongLifeTempDir("patches"); + logFile = new File(tempDir, "LinkNodeExtensionPatch.log"); + RandomAccessFile outputFile = new RandomAccessFile(logFile, "rw"); channel = outputFile.getChannel();