[exo-jcr-commits] exo-jcr SVN: r2578 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/dataflow/serialization and 15 other directories.

Author: tolusha Date: 2010-06-14 08:20:45 -0400 (Mon, 14 Jun 2010) New Revision: 2578 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/DeleteValues.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportImport.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportSysView.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestUpdate.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestFileBasedNamespaceMappings.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationLogTestLoad.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationVSJavaSerializationTestLoad.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/MultipleDeserializationTestLoad.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestEOFException.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java Log: EXOJCR-756: replace file operations on privileged file operations Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -91,7 +91,7 @@ try { sch.close(); - sf.delete(); + PrivilegedFileHelper.delete(sf); } catch (Exception e1) { @@ -142,7 +142,7 @@ try { sfout.close(); - sf.delete(); + PrivilegedFileHelper.delete(sf); } catch (Exception e1) { @@ -297,7 +297,7 @@ try { chch.close(); - chf.delete(); + PrivilegedFileHelper.delete(chf); } catch (Exception e1) { @@ -382,7 +382,7 @@ try { chch.close(); - chf.delete(); + PrivilegedFileHelper.delete(chf); } catch (Exception e1) { @@ -425,7 +425,7 @@ spoolChannel.close(); // delete file - if (!spoolFile.delete()) + if (!PrivilegedFileHelper.delete(spoolFile)) { if (fileCleaner != null) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -697,7 +697,7 @@ if (deleteSpoolFile && PrivilegedFileHelper.exists(spoolFile)) { - if (!spoolFile.delete()) + if (!PrivilegedFileHelper.delete(spoolFile)) { if (fileCleaner != null) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/SerializationSpoolFile.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -22,6 +22,8 @@ import java.io.File; import java.io.FileNotFoundException; +import java.security.AccessController; +import java.security.PrivilegedAction; /** * Created by The eXo Platform SAS. <br/> @@ -80,7 +82,15 @@ { if (!inUse()) { - boolean result = super.delete(); + PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() + { + public Boolean run() + { + return SerializationSpoolFile.super.delete(); + } + }; + boolean result = AccessController.doPrivileged(action); + if (result) { holder.remove(id); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -122,7 +122,7 @@ { // care about storage temp dir cleanup for (File tmpf : tempDir.listFiles()) - if (!tmpf.delete()) + if (!PrivilegedFileHelper.delete(tmpf)) log.warn("Storage temporary directory contains un-deletable file " + PrivilegedFileHelper.getAbsolutePath(tmpf) + ". It's recommended to leave this directory for JCR External Values Storage private use."); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -82,7 +82,7 @@ String[] ls = PrivilegedFileHelper.list(fp);; if (ls != null && ls.length <= 0) { - if (res = fp.delete()) + if (res = PrivilegedFileHelper.delete(fp)) { res = deleteParent(new File(fp.getParent())); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -211,7 +211,7 @@ try { // delete temp file - it's new file add - tempFile.delete(); // should be ok without file cleaner + PrivilegedFileHelper.delete(tempFile); // should be ok without file cleaner } finally { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/DeleteValues.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/DeleteValues.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/DeleteValues.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -20,6 +20,7 @@ import org.exoplatform.services.jcr.impl.storage.value.ValueDataResourceHolder; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.IOException; @@ -100,7 +101,7 @@ { for (File f : files) { - if (!f.delete()) + if (!PrivilegedFileHelper.delete(f)) // TODO possible place of error: FileNotFoundException when we delete/update existing // Value and then add/update again. // After the time the Cleaner will delete the file which is mapped to the Value. Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportImport.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportImport.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportImport.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -22,7 +22,6 @@ import org.xml.sax.SAXException; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Calendar; @@ -102,7 +101,7 @@ } } - destFile.delete(); + PrivilegedFileHelper.delete(destFile); } public void testExportImportCustomNodeType() throws Exception @@ -181,7 +180,7 @@ } } - destFile.delete(); + PrivilegedFileHelper.delete(destFile); } public void testMixinExportImportDocumentViewContentHandler() throws Exception Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportSysView.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportSysView.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportSysView.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -28,7 +28,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Calendar; @@ -237,7 +236,7 @@ testNode.unlock(); testNode.remove(); session.save(); - assertTrue(destFile.delete()); + assertTrue(PrivilegedFileHelper.delete(destFile)); } public void testMultyValueExportCh() throws ItemExistsException, PathNotFoundException, VersionException, @@ -297,7 +296,7 @@ } } } - destFile.delete(); + PrivilegedFileHelper.delete(destFile); } public void testMultyValueExportStream() throws ItemExistsException, PathNotFoundException, VersionException, @@ -351,7 +350,7 @@ } } } - destFile.delete(); + PrivilegedFileHelper.delete(destFile); } public void testMultyValueExportStreamSkipBinary() throws ItemExistsException, PathNotFoundException, @@ -403,7 +402,7 @@ } } } - destFile.delete(); + PrivilegedFileHelper.delete(destFile); } public void testWithContentHandler() throws RepositoryException, SAXException Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -31,8 +31,6 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -622,7 +620,7 @@ if (xmlContent != null) { - xmlContent.delete(); + PrivilegedFileHelper.delete(xmlContent); } super.tearDown(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestUpdate.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestUpdate.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestUpdate.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -22,7 +22,6 @@ import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; import javax.jcr.Node; @@ -73,7 +72,7 @@ { log.error(e); pds.close(); - propData.delete(); + PrivilegedFileHelper.delete(propData); ws1session.refresh(false); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -161,7 +161,7 @@ } finally { - file.delete(); + PrivilegedFileHelper.delete(file); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestFileBasedNamespaceMappings.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestFileBasedNamespaceMappings.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestFileBasedNamespaceMappings.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -21,8 +21,9 @@ import junit.framework.TestCase; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; + import java.io.File; -import java.io.FileOutputStream; import java.util.Properties; /** @@ -79,7 +80,7 @@ @Override protected void tearDown() throws Exception { - test_mapp.delete(); + PrivilegedFileHelper.delete(test_mapp); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -105,7 +105,7 @@ if (PrivilegedFileHelper.exists(testFile)) { - testFile.delete(); + PrivilegedFileHelper.delete(testFile); } TestSwapFile.cleanShare(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationLogTestLoad.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationLogTestLoad.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationLogTestLoad.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -24,7 +24,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.util.Calendar; import java.util.List; @@ -57,7 +56,7 @@ fis.close(); - file.delete(); + PrivilegedFileHelper.delete(file); List<TransactionChangesLog> logs = pl.pushChanges(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationVSJavaSerializationTestLoad.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationVSJavaSerializationTestLoad.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationVSJavaSerializationTestLoad.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -20,14 +20,11 @@ import org.exoplatform.services.jcr.impl.dataflow.AbstractPersistedValueData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; -import org.exoplatform.services.jcr.impl.dataflow.persistent.FilePersistedValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.StreamPersistedValueData; import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -103,7 +100,7 @@ jcrread += t3; jcrin.close(); - jcrfile.delete(); + PrivilegedFileHelper.delete(jcrfile); } @@ -138,7 +135,7 @@ javaRead += t4; jin.close(); - jfile.delete(); + PrivilegedFileHelper.delete(jfile); } System.out.println(" JCR s- " + (jcrwrite / iterations)); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/MultipleDeserializationTestLoad.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/MultipleDeserializationTestLoad.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/MultipleDeserializationTestLoad.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -29,8 +29,6 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; @@ -158,7 +156,7 @@ jcrread += t3; jcrin.close(); } - jcrfile.delete(); + PrivilegedFileHelper.delete(jcrfile); System.out.println(" JCR first des - " + (jcrfread)); System.out.println(" JCR des- " + (jcrread / iterations)); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestEOFException.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestEOFException.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestEOFException.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -24,8 +24,6 @@ import java.io.EOFException; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; import java.util.Random; @@ -66,7 +64,7 @@ or.close(); } - test.delete(); + PrivilegedFileHelper.delete(test); } public void testReadBoolean() throws Exception @@ -95,7 +93,7 @@ or.close(); } - test.delete(); + PrivilegedFileHelper.delete(test); } public void testReadInt() throws Exception @@ -125,7 +123,7 @@ or.close(); } - test.delete(); + PrivilegedFileHelper.delete(test); } public void testReadLong() throws Exception @@ -155,7 +153,7 @@ or.close(); } - test.delete(); + PrivilegedFileHelper.delete(test); } protected byte[] createBLOBTempData(int size) throws IOException Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -628,12 +628,12 @@ { if (sf.isDirectory() && PrivilegedFileHelper.list(sf).length > 0) count += deleteRecursive(sf); - else if (sf.delete()) + else if (PrivilegedFileHelper.delete(sf)) count += 1; else LOG.warn("Can't delete file " + PrivilegedFileHelper.getAbsolutePath(sf)); } - count += dir.delete() ? 1 : 0; + count += PrivilegedFileHelper.delete(dir) ? 1 : 0; return count; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -74,7 +74,7 @@ File file = new File(rootDir, "testReadFromIOChannel0"); PrivilegedFileHelper.deleteOnExit(file); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); @@ -83,7 +83,7 @@ file = new File(rootDir, "testReadFromIOChannel1"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -87,7 +87,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadByteArrayValueData"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); @@ -109,7 +109,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadFileValueData"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); @@ -138,7 +138,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testWriteFileValueData"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); TransientValueData vd = new TransientValueData(0, buf, null, null, null, 1024, null, false); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -132,7 +132,7 @@ @Override public void tearDown() throws Exception { - dest.delete(); + PrivilegedFileHelper.delete(dest); super.tearDown(); } @@ -173,7 +173,7 @@ System.out.println("\t=== IO time " + (System.currentTimeMillis() - start)); // clean and recreate file - dest.delete(); + PrivilegedFileHelper.delete(dest); dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); // copy via NIO @@ -256,7 +256,7 @@ System.out.println("\t=== IO time " + (System.currentTimeMillis() - start)); // clean and recreate file - dest.delete(); + PrivilegedFileHelper.delete(dest); dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); // copy via NIO Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -100,7 +100,7 @@ val.getStream();// to spool data; inputStream.close(); if (file != null) - file.delete(); + PrivilegedFileHelper.delete(file); break; case PropertyType.BOOLEAN : val = valueFactory.createValue(random.nextBoolean()); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -60,7 +60,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamValueData"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); @@ -113,7 +113,7 @@ .getBytes(); File file = new File("target/testConcurrentFileStreamValueDataReading"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); // approx. 10Kb file for (int i = 0; i < 100; i++) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -71,7 +71,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamTransientValueData"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -55,7 +55,7 @@ byte[] buf = "012345678901234567890123456789".getBytes(); File file = new File("target/testNewBinaryValue"); if (PrivilegedFileHelper.exists(file)) - file.delete(); + PrivilegedFileHelper.delete(file); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); out.close(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -113,7 +113,7 @@ try { if (testFile != null) - testFile.delete(); + PrivilegedFileHelper.delete(testFile); } catch (Throwable e) { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -101,7 +101,7 @@ n1.remove(); session.save(); PrivilegedFileHelper.deleteOnExit(file); - file.delete(); + PrivilegedFileHelper.delete(file); } @@ -165,7 +165,7 @@ n1.remove(); session.save(); PrivilegedFileHelper.deleteOnExit(file); - file.delete(); + PrivilegedFileHelper.delete(file); } public void testIEPdfFiles() throws Exception @@ -225,7 +225,7 @@ n1.remove(); session.save(); PrivilegedFileHelper.deleteOnExit(file); - file.delete(); + PrivilegedFileHelper.delete(file); } public void testRandomSizeExportImportSysView() throws Exception @@ -297,7 +297,7 @@ n1.remove(); session.save(); PrivilegedFileHelper.deleteOnExit(file); - file.delete(); + PrivilegedFileHelper.delete(file); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java 2010-06-14 12:17:27 UTC (rev 2577) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java 2010-06-14 12:20:45 UTC (rev 2578) @@ -112,6 +112,6 @@ } assertTrue(PrivilegedFileHelper.exists(vd2.getFile())); - f.delete(); + PrivilegedFileHelper.delete(f); } }