[exo-jcr-commits] exo-jcr SVN: r2593 - in jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr: api/core/query and 31 other directories.

Author: tolusha Date: 2010-06-15 04:44:56 -0400 (Tue, 15 Jun 2010) New Revision: 2593 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/BaseStandaloneTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/IndexingQueueTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportDocView.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/AbstractImportTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestDocumentViewImport.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.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/nodetypes/TestValueConstraints.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestSetProperty.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/cluster/BaseClusteringFunctionalTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.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/TestWorkspaceRestore.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestErrorMultithreading.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestErrorLog.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/core/security/BaseSecurityTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestByteArrayPersistedValueDataSerialization.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/JcrImplSerializationBaseTest.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/dataflow/serialization/TestJCRSerializationCopyMove.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationStream.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationVersionRestore.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.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/Probe.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/TestRemoveFromValueStorage.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/TestTransientValueDataSpooling.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/lab/cluster/test/TestBLOBValue.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/java/TestFileLock.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValue.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValueMultiThreading.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/load/blob/TestLoadRepo.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue1.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/CreateThread.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/NtFileCreatorThread.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestPerformance.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java 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/TestRollbackBigFiles.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/TestExportImportAmongSessions.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/version/FileRestoreTest.java Log: EXOJCR-756: revert tests Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/BaseStandaloneTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/BaseStandaloneTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/BaseStandaloneTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -30,7 +30,6 @@ import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.ReaderSpoolFileHolder; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.impl.util.io.WorkspaceFileCleanerHolder; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.log.ExoLogger; @@ -102,7 +101,6 @@ } } - @Override public void setUp() throws Exception { String configPath = System.getProperty("jcr.test.configuration.file"); @@ -159,14 +157,8 @@ (WorkspaceFileCleanerHolder)wsc.getComponent(WorkspaceFileCleanerHolder.class); fileCleaner = wfcleaner.getFileCleaner(); holder = new ReaderSpoolFileHolder(); - - // URL url = Thread.currentThread().getContextClassLoader().getResource("./test.policy"); - // Policy.setPolicy(new PolicyFile(url)); - // - // System.setSecurityManager(new TesterSecurityManager()); } - @Override protected void tearDown() throws Exception { if (session != null) @@ -398,8 +390,8 @@ // create test file byte[] data = new byte[1024]; // 1Kb - File testFile = PrivilegedFileHelper.createTempFile(prefix, ".tmp"); - FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + File testFile = File.createTempFile(prefix, ".tmp"); + FileOutputStream tempOut = new FileOutputStream(testFile); Random random = new Random(); for (int i = 0; i < sizeInKb; i++) @@ -408,11 +400,10 @@ tempOut.write(data); } tempOut.close(); - PrivilegedFileHelper.deleteOnExit(testFile); // delete on test exit + testFile.deleteOnExit(); // delete on test exit if (log.isDebugEnabled()) { - log.debug("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " - + PrivilegedFileHelper.length(testFile)); + log.debug("Temp file created: " + testFile.getAbsolutePath() + " size: " + testFile.length()); } return testFile; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -16,125 +16,103 @@ */ package org.exoplatform.services.jcr.api.core.query; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; - -import java.io.BufferedInputStream; +import javax.jcr.Node; import java.io.File; import java.io.InputStream; +import java.io.FileInputStream; +import java.io.BufferedInputStream; import java.net.URLConnection; import java.util.Calendar; -import javax.jcr.Node; - /** * <code>TextExtractorTest</code> implements a file / folder import from the * local file system. */ -public class TextExtractorTest extends AbstractQueryTest -{ +public class TextExtractorTest extends AbstractQueryTest { - private static final String TEST_FOLDER = "test-data"; + private static final String TEST_FOLDER = "test-data"; - private int fileCount = 0; + private int fileCount = 0; - public void testImport() throws Exception - { - File sourceFolder = new File(TEST_FOLDER); - // only run if there is test data - if (!PrivilegedFileHelper.exists(sourceFolder)) - { - return; - } - long time = System.currentTimeMillis(); - addContents(sourceFolder, testRootNode.addNode(sourceFolder.getName(), "nt:folder")); - superuser.save(); - time = System.currentTimeMillis() - time; - log.println("Imported " + fileCount + " files in " + time + " ms."); - } + public void testImport() throws Exception { + File sourceFolder = new File(TEST_FOLDER); + // only run if there is test data + if (!sourceFolder.exists()) { + return; + } + long time = System.currentTimeMillis(); + addContents(sourceFolder, + testRootNode.addNode(sourceFolder.getName(), "nt:folder")); + superuser.save(); + time = System.currentTimeMillis() - time; + log.println("Imported " + fileCount + " files in " + time + " ms."); + } - /** - * Recursively adds files and folders to the workspace. - */ - private void addContents(File folder, Node n) throws Exception - { - String[] names = PrivilegedFileHelper.list(folder); - for (int i = 0; i < names.length; i++) - { - File f = new File(folder, names[i]); - if (f.canRead()) - { - if (f.isDirectory()) - { - log.println("Added folder: " + PrivilegedFileHelper.getAbsolutePath(f)); - addContents(f, n.addNode(names[i], "nt:folder")); + /** + * Recursively adds files and folders to the workspace. + */ + private void addContents(File folder, Node n) throws Exception { + String[] names = folder.list(); + for (int i = 0; i < names.length; i++) { + File f = new File(folder, names[i]); + if (f.canRead()) { + if (f.isDirectory()) { + log.println("Added folder: " + f.getAbsolutePath()); + addContents(f, n.addNode(names[i], "nt:folder")); + } else { + addFile(n, f); + log.println("Added file: " + f.getAbsolutePath()); + // save after 100 files + if (++fileCount % 100 == 0) { + n.getSession().save(); + } + } } - else - { - addFile(n, f); - log.println("Added file: " + PrivilegedFileHelper.getAbsolutePath(f)); - // save after 100 files - if (++fileCount % 100 == 0) - { - n.getSession().save(); - } + } + } + + /** + * Repeatedly update a file in the workspace and force text extraction + * on it. + */ + public void testRepeatedUpdate() throws Exception { + File testFile = new File("test.pdf"); + if (!testFile.exists()) { + return; + } + Node resource = addFile(testRootNode, testFile).getNode("jcr:content"); + superuser.save(); + for (int i = 0; i < 10; i++) { + // kick start text extractor + executeXPathQuery(testPath, new Node[]{testRootNode}); + InputStream in = new BufferedInputStream(new FileInputStream(testFile)); + try { + resource.setProperty("jcr:data", in); + } finally { + in.close(); } - } - } - } + log.println("updating resource..."); + superuser.save(); + } + } - /** - * Repeatedly update a file in the workspace and force text extraction - * on it. - */ - public void testRepeatedUpdate() throws Exception - { - File testFile = new File("test.pdf"); - if (!PrivilegedFileHelper.exists(testFile)) - { - return; - } - Node resource = addFile(testRootNode, testFile).getNode("jcr:content"); - superuser.save(); - for (int i = 0; i < 10; i++) - { - // kick start text extractor - executeXPathQuery(testPath, new Node[]{testRootNode}); - InputStream in = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(testFile)); - try - { + private static Node addFile(Node folder, File f) throws Exception { + String mimeType = URLConnection.guessContentTypeFromName(f.getName()); + if (mimeType == null) { + mimeType = "application/octet-stream"; + } + Node file = folder.addNode(f.getName(), "nt:file"); + Node resource = file.addNode("jcr:content", "nt:resource"); + InputStream in = new BufferedInputStream(new FileInputStream(f)); + try { resource.setProperty("jcr:data", in); - } - finally - { + resource.setProperty("jcr:mimeType", mimeType); + Calendar lastModified = Calendar.getInstance(); + lastModified.setTimeInMillis(f.lastModified()); + resource.setProperty("jcr:lastModified", lastModified); + } finally { in.close(); - } - log.println("updating resource..."); - superuser.save(); - } - } - - private static Node addFile(Node folder, File f) throws Exception - { - String mimeType = URLConnection.guessContentTypeFromName(f.getName()); - if (mimeType == null) - { - mimeType = "application/octet-stream"; - } - Node file = folder.addNode(f.getName(), "nt:file"); - Node resource = file.addNode("jcr:content", "nt:resource"); - InputStream in = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(f)); - try - { - resource.setProperty("jcr:data", in); - resource.setProperty("jcr:mimeType", mimeType); - Calendar lastModified = Calendar.getInstance(); - lastModified.setTimeInMillis(f.lastModified()); - resource.setProperty("jcr:lastModified", lastModified); - } - finally - { - in.close(); - } - return file; - } + } + return file; + } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/IndexingQueueTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/IndexingQueueTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/IndexingQueueTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -16,13 +16,13 @@ */ package org.exoplatform.services.jcr.api.core.query.lucene; + + import org.exoplatform.services.jcr.api.core.query.AbstractIndexingTest; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.query.lucene.IndexingQueue; import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex; -import org.exoplatform.services.jcr.impl.util.SecurityHelper; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -42,206 +42,204 @@ * nodes in a background thread when text extraction takes more than 10 ms. See * the workspace.xml file for the indexing-test workspace. */ -public class IndexingQueueTest extends AbstractIndexingTest -{ +public class IndexingQueueTest extends AbstractIndexingTest { - private static final File TEMP_DIR = new File(SecurityHelper.getSystemProperty("java.io.tmpdir")); + private static final File TEMP_DIR = new File(System.getProperty("java.io.tmpdir")); - private static final String CONTENT_TYPE = "application/indexing-queue-test"; + private static final String CONTENT_TYPE = "application/indexing-queue-test"; - private static final String ENCODING = "UTF-8"; - - public void testname() throws Exception + private static final String ENCODING = "UTF-8"; + public void testname() throws Exception { - + } - // - // public void testQueue() throws Exception { - // Extractor.sleepTime = 200; - // SearchIndex index = (SearchIndex) getQueryHandler(); - // IndexingQueue queue = index.getIndex().getIndexingQueue(); - // - // assertEquals(0, queue.getNumPendingDocuments()); - // - // String text = "the quick brown fox jumps over the lazy dog."; - // InputStream in = new ByteArrayInputStream(text.getBytes(ENCODING)); - // Node resource = testRootNode.addNode(nodeName1, "nt:resource"); - // resource.setProperty("jcr:data", in); - // resource.setProperty("jcr:lastModified", Calendar.getInstance()); - // resource.setProperty("jcr:mimeType", CONTENT_TYPE); - // resource.setProperty("jcr:encoding", ENCODING); - // session.save(); - // - // assertEquals(1, queue.getNumPendingDocuments()); - // - // Query q = qm.createQuery(testPath + "/*[jcr:contains(., 'fox')]", Query.XPATH); - // NodeIterator nodes = q.execute().getNodes(); - // assertFalse(nodes.hasNext()); - // - // synchronized (index.getIndex()) { - // while (queue.getNumPendingDocuments() > 0) { - // index.getIndex().wait(50); - // } - // } - // - // q = qm.createQuery(testPath + "/*[jcr:contains(., 'fox')]", Query.XPATH); - // nodes = q.execute().getNodes(); - // assertTrue(nodes.hasNext()); - // } - // - // public void testInitialIndex() throws Exception { - // Extractor.sleepTime = 200; - // SearchIndex index = (SearchIndex) getQueryHandler(); - // File indexDir = PrivilegedFileHelper.file(index.getPath()); - // - // // fill workspace - // Node testFolder = testRootNode.addNode("folder", "nt:folder"); - // String text = "the quick brown fox jumps over the lazy dog."; - // int num = createFiles(testFolder, text.getBytes(ENCODING), 10, 2, 0); - // session.save(); - // - // // shutdown workspace - // RepositoryImpl repo = (RepositoryImpl) session.getRepository(); - // session.logout(); - // session = null; - // superuser.logout(); - // superuser = null; - // TestHelper.shutdownWorkspace(WORKSPACE_NAME, repo); - // - // // delete index - // try { - // FileUtil.delete(indexDir); - // } catch (IOException e) { - // fail("Unable to delete index directory"); - // } - // - // int initialNumExtractorFiles = getNumExtractorFiles(); - // - // Extractor.sleepTime = 20; - // Thread t = new Thread(new Runnable() { - // public void run() { - // try { - // session = helper.getSuperuserSession(WORKSPACE_NAME); - // } catch (RepositoryException e) { - // throw new RuntimeException(e); - // } - // } - // }); - // t.start(); - // - // while (t.isAlive()) { - // // there must not be more than 20 extractor files, because: - // // - initial index creation checks indexing queue every 10 nodes - // // - there is an aggregate definition on the workspace that causes - // // 2 extractor jobs per nt:resource - // // => 2 * 10 = 20 - // int numFiles = getNumExtractorFiles() - initialNumExtractorFiles; - // assertTrue(numFiles <= 20); - // Thread.sleep(50); - // } - // - // qm = session.getWorkspace().getQueryManager(); - // index = (SearchIndex) getQueryHandler(); - // IndexingQueue queue = index.getIndex().getIndexingQueue(); - // - // // flush index to make sure any documents in the buffer are written - // // to the index. this is to make sure all nodes are pushed either to - // // the index or to the indexing queue - // index.getIndex().flush(); - // - // synchronized (index.getIndex()) { - // while (queue.getNumPendingDocuments() > 0) { - // index.getIndex().wait(50); - // } - // } - // - // String stmt = testPath + "//element(*, nt:resource)[jcr:contains(., 'fox')]"; - // Query q = qm.createQuery(stmt, Query.XPATH); - // assertEquals(num, q.execute().getNodes().getSize()); - // } - // - // /* - // * Test case for JCR-2082 - // */ - // public void testReaderUpToDate() throws Exception { - // Extractor.sleepTime = 10; - // SearchIndex index = (SearchIndex) getQueryHandler(); - // File indexDir = PrivilegedFileHelper.file(index.getPath()); - // - // // shutdown workspace - // RepositoryImpl repo = (RepositoryImpl) session.getRepository(); - // session.logout(); - // session = null; - // superuser.logout(); - // superuser = null; - // TestHelper.shutdownWorkspace(WORKSPACE_NAME, repo); - // - // // delete index - // try { - // FileUtil.delete(indexDir); - // } catch (IOException e) { - // fail("Unable to delete index directory"); - // } - // - // // start workspace again by getting a session - // session = helper.getSuperuserSession(WORKSPACE_NAME); - // - // qm = session.getWorkspace().getQueryManager(); - // - // Query q = qm.createQuery(testPath, Query.XPATH); - // assertEquals(1, getSize(q.execute().getNodes())); - // } - // - // private int createFiles(Node folder, byte[] data, - // int filesPerLevel, int levels, int count) - // throws RepositoryException { - // levels--; - // for (int i = 0; i < filesPerLevel; i++) { - // // create files - // Node file = folder.addNode("file" + i, "nt:file"); - // InputStream in = new ByteArrayInputStream(data); - // Node resource = file.addNode("jcr:content", "nt:resource"); - // resource.setProperty("jcr:data", in); - // resource.setProperty("jcr:lastModified", Calendar.getInstance()); - // resource.setProperty("jcr:mimeType", CONTENT_TYPE); - // resource.setProperty("jcr:encoding", ENCODING); - // count++; - // } - // if (levels > 0) { - // for (int i = 0; i < filesPerLevel; i++) { - // // create files - // Node subFolder = folder.addNode("folder" + i, "nt:folder"); - // count = createFiles(subFolder, data, - // filesPerLevel, levels, count); - // } - // } - // return count; - // } - // - // private int getNumExtractorFiles() throws IOException { - // return TEMP_DIR.listFiles(new FilenameFilter() { - // public boolean accept(File dir, String name) { - // return name.startsWith("extractor"); - // } - // }).length; - // } +// +// public void testQueue() throws Exception { +// Extractor.sleepTime = 200; +// SearchIndex index = (SearchIndex) getQueryHandler(); +// IndexingQueue queue = index.getIndex().getIndexingQueue(); +// +// assertEquals(0, queue.getNumPendingDocuments()); +// +// String text = "the quick brown fox jumps over the lazy dog."; +// InputStream in = new ByteArrayInputStream(text.getBytes(ENCODING)); +// Node resource = testRootNode.addNode(nodeName1, "nt:resource"); +// resource.setProperty("jcr:data", in); +// resource.setProperty("jcr:lastModified", Calendar.getInstance()); +// resource.setProperty("jcr:mimeType", CONTENT_TYPE); +// resource.setProperty("jcr:encoding", ENCODING); +// session.save(); +// +// assertEquals(1, queue.getNumPendingDocuments()); +// +// Query q = qm.createQuery(testPath + "/*[jcr:contains(., 'fox')]", Query.XPATH); +// NodeIterator nodes = q.execute().getNodes(); +// assertFalse(nodes.hasNext()); +// +// synchronized (index.getIndex()) { +// while (queue.getNumPendingDocuments() > 0) { +// index.getIndex().wait(50); +// } +// } +// +// q = qm.createQuery(testPath + "/*[jcr:contains(., 'fox')]", Query.XPATH); +// nodes = q.execute().getNodes(); +// assertTrue(nodes.hasNext()); +// } +// +// public void testInitialIndex() throws Exception { +// Extractor.sleepTime = 200; +// SearchIndex index = (SearchIndex) getQueryHandler(); +// File indexDir = new File(index.getPath()); +// +// // fill workspace +// Node testFolder = testRootNode.addNode("folder", "nt:folder"); +// String text = "the quick brown fox jumps over the lazy dog."; +// int num = createFiles(testFolder, text.getBytes(ENCODING), 10, 2, 0); +// session.save(); +// +// // shutdown workspace +// RepositoryImpl repo = (RepositoryImpl) session.getRepository(); +// session.logout(); +// session = null; +// superuser.logout(); +// superuser = null; +// TestHelper.shutdownWorkspace(WORKSPACE_NAME, repo); +// +// // delete index +// try { +// FileUtil.delete(indexDir); +// } catch (IOException e) { +// fail("Unable to delete index directory"); +// } +// +// int initialNumExtractorFiles = getNumExtractorFiles(); +// +// Extractor.sleepTime = 20; +// Thread t = new Thread(new Runnable() { +// public void run() { +// try { +// session = helper.getSuperuserSession(WORKSPACE_NAME); +// } catch (RepositoryException e) { +// throw new RuntimeException(e); +// } +// } +// }); +// t.start(); +// +// while (t.isAlive()) { +// // there must not be more than 20 extractor files, because: +// // - initial index creation checks indexing queue every 10 nodes +// // - there is an aggregate definition on the workspace that causes +// // 2 extractor jobs per nt:resource +// // => 2 * 10 = 20 +// int numFiles = getNumExtractorFiles() - initialNumExtractorFiles; +// assertTrue(numFiles <= 20); +// Thread.sleep(50); +// } +// +// qm = session.getWorkspace().getQueryManager(); +// index = (SearchIndex) getQueryHandler(); +// IndexingQueue queue = index.getIndex().getIndexingQueue(); +// +// // flush index to make sure any documents in the buffer are written +// // to the index. this is to make sure all nodes are pushed either to +// // the index or to the indexing queue +// index.getIndex().flush(); +// +// synchronized (index.getIndex()) { +// while (queue.getNumPendingDocuments() > 0) { +// index.getIndex().wait(50); +// } +// } +// +// String stmt = testPath + "//element(*, nt:resource)[jcr:contains(., 'fox')]"; +// Query q = qm.createQuery(stmt, Query.XPATH); +// assertEquals(num, q.execute().getNodes().getSize()); +// } +// +// /* +// * Test case for JCR-2082 +// */ +// public void testReaderUpToDate() throws Exception { +// Extractor.sleepTime = 10; +// SearchIndex index = (SearchIndex) getQueryHandler(); +// File indexDir = new File(index.getPath()); +// +// // shutdown workspace +// RepositoryImpl repo = (RepositoryImpl) session.getRepository(); +// session.logout(); +// session = null; +// superuser.logout(); +// superuser = null; +// TestHelper.shutdownWorkspace(WORKSPACE_NAME, repo); +// +// // delete index +// try { +// FileUtil.delete(indexDir); +// } catch (IOException e) { +// fail("Unable to delete index directory"); +// } +// +// // start workspace again by getting a session +// session = helper.getSuperuserSession(WORKSPACE_NAME); +// +// qm = session.getWorkspace().getQueryManager(); +// +// Query q = qm.createQuery(testPath, Query.XPATH); +// assertEquals(1, getSize(q.execute().getNodes())); +// } +// +// private int createFiles(Node folder, byte[] data, +// int filesPerLevel, int levels, int count) +// throws RepositoryException { +// levels--; +// for (int i = 0; i < filesPerLevel; i++) { +// // create files +// Node file = folder.addNode("file" + i, "nt:file"); +// InputStream in = new ByteArrayInputStream(data); +// Node resource = file.addNode("jcr:content", "nt:resource"); +// resource.setProperty("jcr:data", in); +// resource.setProperty("jcr:lastModified", Calendar.getInstance()); +// resource.setProperty("jcr:mimeType", CONTENT_TYPE); +// resource.setProperty("jcr:encoding", ENCODING); +// count++; +// } +// if (levels > 0) { +// for (int i = 0; i < filesPerLevel; i++) { +// // create files +// Node subFolder = folder.addNode("folder" + i, "nt:folder"); +// count = createFiles(subFolder, data, +// filesPerLevel, levels, count); +// } +// } +// return count; +// } +// +// private int getNumExtractorFiles() throws IOException { +// return TEMP_DIR.listFiles(new FilenameFilter() { +// public boolean accept(File dir, String name) { +// return name.startsWith("extractor"); +// } +// }).length; +// } - // public static final class Extractor implements TextExtractor { - // - // protected static volatile int sleepTime = 200; - // - // public String[] getContentTypes() { - // return new String[]{CONTENT_TYPE}; - // } - // - // public Reader extractText(InputStream stream, String type, String encoding) - // throws IOException { - // try { - // Thread.sleep(sleepTime); - // } catch (InterruptedException e) { - // throw new IOException(); - // } - // return new InputStreamReader(stream, encoding); - // } - // } +// public static final class Extractor implements TextExtractor { +// +// protected static volatile int sleepTime = 200; +// +// public String[] getContentTypes() { +// return new String[]{CONTENT_TYPE}; +// } +// +// public Reader extractText(InputStream stream, String type, String encoding) +// throws IOException { +// try { +// Thread.sleep(sleepTime); +// } catch (InterruptedException e) { +// throw new IOException(); +// } +// return new InputStreamReader(stream, encoding); +// } + // } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -23,7 +23,6 @@ import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager; import org.exoplatform.services.jcr.impl.core.query.lucene.directory.FSDirectoryManager; import org.exoplatform.services.jcr.impl.core.query.lucene.directory.RAMDirectoryManager; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.util.Arrays; @@ -34,103 +33,88 @@ * <code>DirectoryManagerTest</code> performs tests on directory manager * implementations. */ -public class DirectoryManagerTest extends TestCase -{ +public class DirectoryManagerTest extends TestCase { - private static final Collection IMPLEMENTATIONS = - Arrays.asList(new Class[]{FSDirectoryManager.class, RAMDirectoryManager.class}); + private static final Collection IMPLEMENTATIONS = Arrays + .asList(new Class[] { FSDirectoryManager.class, + RAMDirectoryManager.class }); - private static final SearchIndex INDEX = new SearchIndex(); + private static final SearchIndex INDEX = new SearchIndex(); - private static final String TEST = "test"; + private static final String TEST = "test"; - private static final String RENAMED = "renamed"; + private static final String RENAMED = "renamed"; - static - { - INDEX.setPath(PrivilegedFileHelper.getAbsolutePath(new File(new File("target"), "directory-factory-test"))); - } + static { + INDEX.setPath(new File(new File("target"), "directory-factory-test") + .getAbsolutePath()); + } - @Override - protected void tearDown() throws Exception - { - new File(INDEX.getPath(), TEST).delete(); - new File(INDEX.getPath(), RENAMED).delete(); - } + protected void tearDown() throws Exception { + new File(INDEX.getPath(), TEST).delete(); + new File(INDEX.getPath(), RENAMED).delete(); + } - public void testHasDirectory() throws Exception - { - execute(new Callable() - { - public void call(DirectoryManager directoryManager) throws Exception - { - Directory dir = directoryManager.getDirectory(TEST); - assertTrue(directoryManager.hasDirectory(TEST)); - dir.close(); - } - }); - } + public void testHasDirectory() throws Exception { + execute(new Callable() { + public void call(DirectoryManager directoryManager) + throws Exception { + Directory dir = directoryManager.getDirectory(TEST); + assertTrue(directoryManager.hasDirectory(TEST)); + dir.close(); + } + }); + } - public void testDelete() throws Exception - { - execute(new Callable() - { - public void call(DirectoryManager directoryManager) throws Exception - { - directoryManager.getDirectory(TEST).close(); - directoryManager.delete(TEST); - assertFalse(directoryManager.hasDirectory(TEST)); - } - }); - } + public void testDelete() throws Exception { + execute(new Callable() { + public void call(DirectoryManager directoryManager) + throws Exception { + directoryManager.getDirectory(TEST).close(); + directoryManager.delete(TEST); + assertFalse(directoryManager.hasDirectory(TEST)); + } + }); + } - public void testGetDirectoryNames() throws Exception - { - execute(new Callable() - { - public void call(DirectoryManager directoryManager) throws Exception - { - directoryManager.getDirectory(TEST).close(); - assertTrue(Arrays.asList(directoryManager.getDirectoryNames()).contains(TEST)); - } - }); - } + public void testGetDirectoryNames() throws Exception { + execute(new Callable() { + public void call(DirectoryManager directoryManager) + throws Exception { + directoryManager.getDirectory(TEST).close(); + assertTrue(Arrays.asList(directoryManager.getDirectoryNames()) + .contains(TEST)); + } + }); + } - public void testRename() throws Exception - { - execute(new Callable() - { - public void call(DirectoryManager directoryManager) throws Exception - { - directoryManager.getDirectory(TEST).close(); - directoryManager.rename(TEST, RENAMED); - assertTrue(directoryManager.hasDirectory(RENAMED)); - assertFalse(directoryManager.hasDirectory(TEST)); - } - }); - } + public void testRename() throws Exception { + execute(new Callable() { + public void call(DirectoryManager directoryManager) + throws Exception { + directoryManager.getDirectory(TEST).close(); + directoryManager.rename(TEST, RENAMED); + assertTrue(directoryManager.hasDirectory(RENAMED)); + assertFalse(directoryManager.hasDirectory(TEST)); + } + }); + } - private void execute(Callable callable) throws Exception - { - for (Iterator it = IMPLEMENTATIONS.iterator(); it.hasNext();) - { - Class clazz = (Class)it.next(); - DirectoryManager dirMgr = (DirectoryManager)clazz.newInstance(); - dirMgr.init(INDEX); - try - { - callable.call(dirMgr); - } - finally - { - dirMgr.dispose(); - } - } - } + private void execute(Callable callable) throws Exception { + for (Iterator it = IMPLEMENTATIONS.iterator(); it.hasNext();) { + Class clazz = (Class) it.next(); + DirectoryManager dirMgr = (DirectoryManager) clazz.newInstance(); + dirMgr.init(INDEX); + try { + callable.call(dirMgr); + } finally { + dirMgr.dispose(); + } + } + } - private interface Callable - { + private interface Callable { - public void call(DirectoryManager directoryManager) throws Exception; - } + public void call(DirectoryManager directoryManager) throws Exception; + } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportDocView.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportDocView.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportDocView.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -22,7 +22,6 @@ import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.core.value.BinaryValue; import org.exoplatform.services.jcr.impl.util.StringConverter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.NodeList; @@ -30,6 +29,8 @@ import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Calendar; @@ -68,7 +69,6 @@ super(); } - @Override public void initRepository() throws RepositoryException { @@ -93,7 +93,6 @@ } - @Override public void tearDown() throws Exception { log.debug(">> get rootNode on TD START"); @@ -139,7 +138,7 @@ File file = createBLOBTempFile(2500);// 2.5M if (log.isDebugEnabled()) log.debug("=== File has created, size " + file.length()); - contentTestPdfNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(file)); + contentTestPdfNode.setProperty("jcr:data", new FileInputStream(file)); contentTestPdfNode.setProperty("jcr:mimeType", "application/octet-stream"); } catch (IOException e) @@ -181,13 +180,13 @@ } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("multyValueExportStream", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("multyValueExportStream", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportDocumentView(testNode.getPath(), outStream, false, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); // assertEquals(Constants.DEFAULT_ENCODING, doc.getXmlEncoding()); @@ -252,9 +251,9 @@ } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("multyValueExportStream", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("multyValueExportStream", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); SAXTransformerFactory saxFact = (SAXTransformerFactory)SAXTransformerFactory.newInstance(); TransformerHandler handler = saxFact.newTransformerHandler(); @@ -272,7 +271,7 @@ outStream.close(); } - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); // assertEquals(Constants.DEFAULT_ENCODING, doc.getXmlEncoding()); @@ -332,14 +331,14 @@ session.save(); testNode.lock(true, true); - File destFile = PrivilegedFileHelper.createTempFile("docLockNodeExport", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("docLockNodeExport", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportDocumentView(firstNode.getPath(), outStream, false, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); // assertEquals(Constants.DEFAULT_ENCODING, doc.getXmlEncoding()); @@ -353,9 +352,9 @@ { Session newSession = repository.login(this.credentials /* - * session.getCredentials - * () - */); + * session.getCredentials + * () + */); newSession.setNamespacePrefix("newjcr", "http://www.jcp.org/jcr/1.0"); @@ -382,9 +381,9 @@ { Session newSession = repository.login(this.credentials /* - * session.getCredentials - * () - */); + * session.getCredentials + * () + */); newSession.setNamespacePrefix("newjcr", "http://www.jcp.org/jcr/1.0"); Node testNode = newSession.getRootNode().addNode("jcr:testExportNamespaceRemaping"); @@ -401,7 +400,7 @@ // session.exportDocumentView(testNode.getPath(), bos, false, false); SAXTransformerFactory saxFact = (SAXTransformerFactory)SAXTransformerFactory.newInstance(); - final TransformerHandler handler = saxFact.newTransformerHandler(); + TransformerHandler handler = saxFact.newTransformerHandler(); handler.setResult(new StreamResult(bos)); newSession.exportDocumentView(testNode.getPath(), handler, false, false); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportImport.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,10 +18,11 @@ */ package org.exoplatform.services.jcr.api.exporting; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.xml.sax.SAXException; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Calendar; @@ -63,17 +64,16 @@ testNode.setProperty("prop" + i + "_binary", valList.get(i), PropertyType.BINARY); } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("testWorkspaceExportImportValuesSysView", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("testWorkspaceExportImportValuesSysView", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportWorkspaceSystemView(outStream, false, false); outStream.close(); testNode.remove(); session.save(); - session.importXML(root.getPath(), PrivilegedFileHelper.fileInputStream(destFile), - ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); + session.importXML(root.getPath(), new FileInputStream(destFile), ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); session.save(); @@ -101,7 +101,7 @@ } } - PrivilegedFileHelper.delete(destFile); + destFile.delete(); } public void testExportImportCustomNodeType() throws Exception @@ -117,17 +117,16 @@ session.save(); - File destFile = PrivilegedFileHelper.createTempFile("testExportImportValuesSysView", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("testExportImportValuesSysView", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(file.getPath(), outStream, false, false); outStream.close(); folder.remove(); session.save(); - session.importXML(root.getPath(), PrivilegedFileHelper.fileInputStream(destFile), - ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); + session.importXML(root.getPath(), new FileInputStream(destFile), ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); session.save(); @@ -142,17 +141,16 @@ testNode.setProperty("prop" + i + "_binary", valList.get(i), PropertyType.BINARY); } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("testExportImportValuesSysView", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("testExportImportValuesSysView", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(testNode.getPath(), outStream, false, false); outStream.close(); testNode.remove(); session.save(); - session.importXML(root.getPath(), PrivilegedFileHelper.fileInputStream(destFile), - ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); + session.importXML(root.getPath(), new FileInputStream(destFile), ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); session.save(); @@ -180,7 +178,7 @@ } } - PrivilegedFileHelper.delete(destFile); + destFile.delete(); } public void testMixinExportImportDocumentViewContentHandler() throws Exception @@ -358,9 +356,9 @@ Node destParentNode) throws RepositoryException, IOException, TransformerConfigurationException, SAXException { Node exportNode = parentNode.getNode(nodeName); - File destFile = PrivilegedFileHelper.createTempFile("testExportImport", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("testExportImport", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); if (isSystemView) { @@ -398,8 +396,8 @@ session.save(); } - session.importXML(destParentNode != null ? destParentNode.getPath() : root.getPath(), PrivilegedFileHelper - .fileInputStream(destFile), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); + session.importXML(destParentNode != null ? destParentNode.getPath() : root.getPath(), new FileInputStream( + destFile), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); session.save(); assertTrue(parentNode.hasNode(nodeName)); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/exporting/TestExportSysView.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,13 +21,14 @@ import org.apache.ws.commons.util.Base64; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.util.StringConverter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; import java.io.ByteArrayOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Calendar; @@ -134,7 +135,7 @@ { File file = createBLOBTempFile(2500);// 2.5M log.info("=== File has created, size " + file.length()); - contentTestPdfNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(file)); + contentTestPdfNode.setProperty("jcr:data", new FileInputStream(file)); contentTestPdfNode.setProperty("jcr:mimeType", "application/octet-stream"); } catch (IOException e) @@ -167,13 +168,13 @@ Node testNode = root.addNode("refNode"); testNode.addMixin("mix:referenceable"); session.save(); - File destFile = PrivilegedFileHelper.createTempFile("testExportReferenceableNodes", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("testExportReferenceableNodes", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(testNode.getPath(), outStream, false, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); NodeList nodes = doc.getElementsByTagName("sv:node"); assertEquals(1, nodes.getLength()); assertEquals(3, nodes.item(0).getChildNodes().getLength()); @@ -216,14 +217,14 @@ session.save(); testNode.lock(true, true); - File destFile = PrivilegedFileHelper.createTempFile("sysLockNodeExport", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("sysLockNodeExport", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(firstNode.getPath(), outStream, false, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); // assertEquals(Constants.DEFAULT_ENCODING, doc.getXmlEncoding()); @@ -236,7 +237,7 @@ testNode.unlock(); testNode.remove(); session.save(); - assertTrue(PrivilegedFileHelper.delete(destFile)); + assertTrue(destFile.delete()); } public void testMultyValueExportCh() throws ItemExistsException, PathNotFoundException, VersionException, @@ -252,8 +253,8 @@ } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("xmlTest", ".xml"); - OutputStream outputStream2 = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("xmlTest", ".xml"); + OutputStream outputStream2 = new FileOutputStream(destFile); SAXTransformerFactory saxFact = (SAXTransformerFactory)TransformerFactory.newInstance(); TransformerHandler handler = saxFact.newTransformerHandler(); @@ -264,7 +265,7 @@ outputStream2.close(); log.info("Export with handler done " + (System.currentTimeMillis() - startTime) / 1000 + " sec"); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); XPathExpression expr = xpath.compile("//sv:property"); Object result = expr.evaluate(doc, XPathConstants.NODESET); @@ -296,7 +297,7 @@ } } } - PrivilegedFileHelper.delete(destFile); + destFile.delete(); } public void testMultyValueExportStream() throws ItemExistsException, PathNotFoundException, VersionException, @@ -312,13 +313,13 @@ } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("sysMultyValueExportStream", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("sysMultyValueExportStream", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(testNode.getPath(), outStream, false, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); XPathExpression expr = xpath.compile("//sv:property"); @@ -350,7 +351,7 @@ } } } - PrivilegedFileHelper.delete(destFile); + destFile.delete(); } public void testMultyValueExportStreamSkipBinary() throws ItemExistsException, PathNotFoundException, @@ -366,13 +367,13 @@ } session.save(); - File destFile = PrivilegedFileHelper.createTempFile("multyValueExportStreamSkipBinary", ".xml"); - PrivilegedFileHelper.deleteOnExit(destFile); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(destFile); + File destFile = File.createTempFile("multyValueExportStreamSkipBinary", ".xml"); + destFile.deleteOnExit(); + OutputStream outStream = new FileOutputStream(destFile); session.exportSystemView(testNode.getPath(), outStream, true, false); outStream.close(); - Document doc = builder.parse(PrivilegedFileHelper.fileInputStream(destFile)); + Document doc = builder.parse(new FileInputStream(destFile)); XPathExpression expr = xpath.compile("//sv:property"); Object result = expr.evaluate(doc, XPathConstants.NODESET); @@ -402,7 +403,7 @@ } } } - PrivilegedFileHelper.delete(destFile); + destFile.delete(); } public void testWithContentHandler() throws RepositoryException, SAXException Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -22,7 +22,6 @@ import org.exoplatform.services.jcr.core.ExtendedSession; import org.exoplatform.services.jcr.core.ExtendedWorkspace; import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -327,7 +326,7 @@ { ExtendedSession extendedSession = (ExtendedSession)rootNode.getSession(); - OutputStream outStream = PrivilegedFileHelper.fileOutputStream(content); + OutputStream outStream = new FileOutputStream(content); if (isSystemView) { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestDocumentViewImport.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestDocumentViewImport.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestDocumentViewImport.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,7 +21,6 @@ import org.exoplatform.services.ext.action.InvocationContext; import org.exoplatform.services.jcr.core.ExtendedSession; import org.exoplatform.services.jcr.impl.util.StringConverter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.impl.xml.importing.ContentImporter; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -340,7 +339,7 @@ { File file = createBLOBTempFile(25);// 2.5M log.info("=== File has created, size " + file.length()); - contentTestPdfNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(file)); + contentTestPdfNode.setProperty("jcr:data", new FileInputStream(file)); contentTestPdfNode.setProperty("jcr:mimeType", "application/octet-stream"); } catch (IOException e) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImport.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -27,7 +27,6 @@ import org.exoplatform.services.jcr.core.ExtendedNode; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.VersionHistoryImporter; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -109,8 +108,8 @@ assertTrue(accessManager.hasPermission(testRoot.getACL(), PermissionType.SET_PROPERTY, new Identity("exo"))); assertFalse(accessManager.hasPermission(testRoot.getACL(), PermissionType.READ, new Identity("exo"))); - File tmp = PrivilegedFileHelper.createTempFile("testAclImpormt", "tmp"); - PrivilegedFileHelper.deleteOnExit(tmp); + File tmp = File.createTempFile("testAclImpormt", "tmp"); + tmp.deleteOnExit(); serialize(testRoot, false, true, tmp); testRoot.remove(); session.save(); @@ -118,7 +117,7 @@ NodeImpl importRoot = (NodeImpl)root.addNode("ImportRoot"); deserialize(importRoot, XmlSaveType.SESSION, true, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING, - new BufferedInputStream(PrivilegedFileHelper.fileInputStream(tmp))); + new BufferedInputStream(new FileInputStream(tmp))); session.save(); Node n1 = importRoot.getNode("TestRoot"); assertTrue("Wrong ACL", accessManager.hasPermission(((NodeImpl)n1).getACL(), PermissionType.SET_PROPERTY, @@ -154,8 +153,8 @@ assertTrue(accessManager.hasPermission(testRoot.getACL(), PermissionType.SET_PROPERTY, new Identity("exo"))); assertFalse(accessManager.hasPermission(testRoot.getACL(), PermissionType.READ, new Identity("exo"))); - File tmp = PrivilegedFileHelper.createTempFile("testAclImpormt", "tmp"); - PrivilegedFileHelper.deleteOnExit(tmp); + File tmp = File.createTempFile("testAclImpormt", "tmp"); + tmp.deleteOnExit(); serialize(testRoot, true, true, tmp); testRoot.remove(); session.save(); @@ -163,7 +162,7 @@ NodeImpl importRoot = (NodeImpl)root.addNode("ImportRoot"); deserialize(importRoot, XmlSaveType.SESSION, true, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING, - new BufferedInputStream(PrivilegedFileHelper.fileInputStream(tmp))); + new BufferedInputStream(new FileInputStream(tmp))); session.save(); Node n1 = importRoot.getNode("TestRoot"); assertTrue("Wrong ACL", accessManager.hasPermission(((NodeImpl)n1).getACL(), PermissionType.SET_PROPERTY, @@ -187,7 +186,6 @@ private Node testRoot; - @Override public void execute() throws RepositoryException { testRoot = testRootNode.addNode("testImportVersionable"); @@ -209,7 +207,6 @@ testRoot.save(); } - @Override public Node getExportRoot() { return testRoot; @@ -219,7 +216,6 @@ BeforeImportAction beforeImportAction = new BeforeImportAction(null, null) { - @Override public void execute() throws RepositoryException { Node testRoot2 = testRootNode.getNode("testImportVersionable"); @@ -227,7 +223,6 @@ testRootNode.save(); } - @Override public Node getImportRoot() { return testRootNode; @@ -241,7 +236,6 @@ private Node testRoot2; - @Override public void execute() throws RepositoryException { testRootNode.save(); @@ -322,7 +316,6 @@ private Node testRoot2; - @Override public void execute() throws RepositoryException { testRootNode.save(); @@ -371,7 +364,6 @@ private Node testRoot; - @Override public void execute() throws RepositoryException { testRoot = testRootNode.addNode("testImportVersionable"); @@ -393,7 +385,6 @@ testRoot.save(); } - @Override public Node getExportRoot() { return testRoot; @@ -403,7 +394,6 @@ BeforeImportAction beforeImportAction = new BeforeImportAction(null, null) { - @Override public Node getImportRoot() throws RepositoryException { Node importRoot = testRootNode.addNode("ImportRoot"); @@ -420,7 +410,6 @@ private Node testRoot2; - @Override public void execute() throws RepositoryException { testRootNode.save(); @@ -495,10 +484,10 @@ } String versionHistory = testRoot.getVersionHistory().getUUID(); - File versionableNodeContent = PrivilegedFileHelper.createTempFile("versionableNodeContent", "tmp"); - File vhNodeContent = PrivilegedFileHelper.createTempFile("vhNodeContent", "tmp"); - PrivilegedFileHelper.deleteOnExit(versionableNodeContent); - PrivilegedFileHelper.deleteOnExit(vhNodeContent); + File versionableNodeContent = File.createTempFile("versionableNodeContent", "tmp"); + File vhNodeContent = File.createTempFile("vhNodeContent", "tmp"); + versionableNodeContent.deleteOnExit(); + vhNodeContent.deleteOnExit(); serialize(testRoot, false, true, versionableNodeContent); serialize(testRoot.getVersionHistory(), false, true, vhNodeContent); @@ -506,7 +495,7 @@ session.save(); deserialize(testRootNode, XmlSaveType.SESSION, true, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING, - new BufferedInputStream(PrivilegedFileHelper.fileInputStream(versionableNodeContent))); + new BufferedInputStream(new FileInputStream(versionableNodeContent))); session.save(); testRoot = testRootNode.getNode("testImportVersionable"); assertTrue(testRoot.isNodeType("mix:versionable")); @@ -514,8 +503,8 @@ assertEquals(1, testRoot.getVersionHistory().getAllVersions().getSize()); VersionHistoryImporter historyImporter = - new VersionHistoryImporter((NodeImpl)testRoot, new BufferedInputStream(PrivilegedFileHelper - .fileInputStream(vhNodeContent)), baseVersionUuid, predecessors, versionHistory); + new VersionHistoryImporter((NodeImpl)testRoot, new BufferedInputStream(new FileInputStream(vhNodeContent)), + baseVersionUuid, predecessors, versionHistory); historyImporter.doImport(); session.save(); @@ -875,18 +864,15 @@ { protected String dumpStr = ""; - @Override protected void entering(Node node, int level) throws RepositoryException { dumpStr += node.getPath() + "\n"; } - @Override protected void leaving(Property property, int level) throws RepositoryException { } - @Override protected void leaving(Node node, int level) throws RepositoryException { } @@ -899,7 +885,6 @@ /** * {@inheritDoc} */ - @Override protected void entering(Property property, int level) throws RepositoryException { dumpStr += " " + property.getPath() + "=" + valToString(property) + " \n"; 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestSystemViewImport.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,7 +20,6 @@ import org.exoplatform.services.ext.action.InvocationContext; import org.exoplatform.services.jcr.core.ExtendedSession; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.impl.xml.importing.ContentImporter; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -31,6 +30,8 @@ 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; @@ -249,9 +250,9 @@ // export - File tmp = PrivilegedFileHelper.createTempFile("__exojcr_TestSysView__", ".tmp"); + File tmp = File.createTempFile("__exojcr_TestSysView__", ".tmp"); - OutputStream xmlOut = PrivilegedFileHelper.fileOutputStream(tmp); + OutputStream xmlOut = new FileOutputStream(tmp); sysview.getSession().exportSystemView(ref.getPath(), xmlOut, false, false); xmlOut.close(); @@ -266,7 +267,7 @@ Node importTarget = sysview.addNode("import target"); sysview.save(); - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); sysview.save(); @@ -280,7 +281,7 @@ // try one more (for same-name sibling nodes test), mus replace before // imported node - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); sysview.save(); @@ -305,7 +306,7 @@ Node importTarget = sysview.addNode("import target"); sysview.save(); - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING); sysview.save(); @@ -323,7 +324,7 @@ .hasProperty("jcr:content/New property 2, string")); // create one more same-name sibling node - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING); sysview.save(); @@ -353,7 +354,7 @@ try { - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); fail("An exception ItemExistsException must be throwed. Node with same uuid already exists"); @@ -366,7 +367,7 @@ // one more time...:) try { - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_COLLISION_THROW); fail("An exception ItemExistsException must be throwed. Node with same uuid already exists. TEST CYCLE2"); } @@ -383,7 +384,7 @@ Node importTarget = sysview.addNode("import target"); sysview.save(); - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); sysview.save(); @@ -394,7 +395,7 @@ assertFalse("Uuids must be different. " + uuid + " != " + importedUuid, uuid.equals(importedUuid)); // create one more same-name sibling node - sysview.getSession().importXML(importTarget.getPath(), PrivilegedFileHelper.fileInputStream(xmlContent), + sysview.getSession().importXML(importTarget.getPath(), new FileInputStream(xmlContent), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); sysview.save(); @@ -620,7 +621,7 @@ if (xmlContent != null) { - PrivilegedFileHelper.delete(xmlContent); + xmlContent.delete(); } super.tearDown(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,10 +21,10 @@ import org.exoplatform.services.jcr.JcrAPIBaseTest; import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; import java.io.InputStream; import javax.jcr.Node; @@ -54,14 +54,13 @@ private static String LOCAL_NORMAL_FILE = null; - @Override public void setUp() throws Exception { super.setUp(); - LOCAL_SMALL_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(16)); // 16Kb - LOCAL_BIG_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(16 * 1024)); // 16Mb - LOCAL_NORMAL_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(17)); // 17Kb + LOCAL_SMALL_FILE = createBLOBTempFile(16).getAbsolutePath(); // 16Kb + LOCAL_BIG_FILE = createBLOBTempFile(16 * 1024).getAbsolutePath(); // 16Mb + LOCAL_NORMAL_FILE = createBLOBTempFile(17).getAbsolutePath(); // 17Kb byte[] xmlData = readXmlContent("/org/exoplatform/services/jcr/api/nodetypes/nodetypes-api-test.xml"); ByteArrayInputStream xmlInput = new ByteArrayInputStream(xmlData); @@ -167,9 +166,8 @@ { Property testProperty = - testValueConstraintsNode.setProperty("jcr:testBINARYINCLUSIVE", PrivilegedFileHelper - .fileInputStream(LOCAL_SMALL_FILE)); - testProperty.setValue(PrivilegedFileHelper.fileInputStream(LOCAL_BIG_FILE)); + testValueConstraintsNode.setProperty("jcr:testBINARYINCLUSIVE", new FileInputStream(LOCAL_SMALL_FILE)); + testProperty.setValue(new FileInputStream(LOCAL_BIG_FILE)); session.save(); } @@ -179,9 +177,8 @@ try { Property testProperty = - testValueConstraintsNode.setProperty("jcr:testBINARYEXCLUSIVE", PrivilegedFileHelper - .fileInputStream(LOCAL_SMALL_FILE)); - testProperty.setValue(PrivilegedFileHelper.fileInputStream(LOCAL_BIG_FILE)); + testValueConstraintsNode.setProperty("jcr:testBINARYEXCLUSIVE", new FileInputStream(LOCAL_SMALL_FILE)); + testProperty.setValue(new FileInputStream(LOCAL_BIG_FILE)); session.save(); fail("setValue(BINARY value) must throw a ConstraintViolationException "); } @@ -193,8 +190,7 @@ try { Property testProperty = - testValueConstraintsNode.setProperty("jcr:testBINARYEXCLUSIVE", PrivilegedFileHelper - .fileInputStream(LOCAL_NORMAL_FILE)); + testValueConstraintsNode.setProperty("jcr:testBINARYEXCLUSIVE", new FileInputStream(LOCAL_NORMAL_FILE)); session.save(); fail("setValue(BINARY value) must throw a ConstraintViolationException "); } @@ -358,7 +354,6 @@ } } - @Override protected void tearDown() throws Exception { if (session.getRootNode().hasNode("testValueConstraints")) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestSetProperty.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestSetProperty.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestSetProperty.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -27,7 +27,6 @@ import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.impl.core.value.NameValue; import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.File; @@ -59,7 +58,6 @@ private TransactionChangesLog cLog; - @Override public void setUp() throws Exception { super.setUp(); @@ -70,7 +68,6 @@ dm.addItemPersistenceListener(this); } - @Override public void initRepository() throws RepositoryException { Node root = session.getRootNode(); @@ -104,7 +101,6 @@ session.save(); } - @Override public void tearDown() throws Exception { @@ -202,7 +198,7 @@ session.refresh(false); - node.setProperty("jcr:defaultValues", new Value[]{valueFactory.createValue(10)}); + node.setProperty("jcr:defaultValues", new Value[]{valueFactory.createValue((long)10)}); assertEquals(PropertyType.LONG, node.getProperty("jcr:defaultValues").getValues()[0].getType()); assertEquals(10, node.getProperty("jcr:defaultValues").getValues()[0].getLong()); node.save(); @@ -371,13 +367,13 @@ Node node = root.addNode("testNode"); File tmpFile1 = createBLOBTempFile(250); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile1)); + node.setProperty("testProp", new FileInputStream(tmpFile1)); File tmpFile2 = createBLOBTempFile(500); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile2)); + node.setProperty("testProp", new FileInputStream(tmpFile2)); File tmpFile3 = createBLOBTempFile(1000); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile3)); + node.setProperty("testProp", new FileInputStream(tmpFile3)); session.save(); @@ -391,7 +387,7 @@ ItemState item = cLog.getAllStates().get(i); // TODO doesn't pass with FileTree VS, ok with CAS if contents different //compareStream(((PropertyData) item.getData()).getValues().get(0).getAsStream(), - // PrivilegedFileHelper.fileInputStream(tempFiles[i - 2])); + // new FileInputStream(tempFiles[i - 2])); } } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/writing/TestUpdate.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,9 +19,9 @@ package org.exoplatform.services.jcr.api.writing; import org.exoplatform.services.jcr.JcrAPIBaseTest; -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; @@ -61,8 +61,9 @@ Node corrNode = (Node)ws1session.getItem(ws1node.getPath()); File propData = createBLOBTempFile(1024); + propData.deleteOnExit(); - InputStream pds = PrivilegedFileHelper.fileInputStream(propData); + InputStream pds = new FileInputStream(propData); try { corrNode.setProperty("prop1", pds); @@ -72,7 +73,7 @@ { log.error(e); pds.close(); - PrivilegedFileHelper.delete(propData); + propData.delete(); ws1session.refresh(false); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/cluster/BaseClusteringFunctionalTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ import junit.framework.TestCase; import org.exoplatform.services.jcr.cluster.JCRWebdavConnection; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.File; @@ -56,7 +55,6 @@ /** * {@inheritDoc} */ - @Override protected void setUp() throws Exception { super.setUp(); @@ -81,7 +79,6 @@ /** * {@inheritDoc} */ - @Override protected void tearDown() throws Exception { super.tearDown(); @@ -113,8 +110,8 @@ // create test file byte[] data = new byte[1024]; // 1Kb - File testFile = PrivilegedFileHelper.createTempFile(prefix, ".tmp"); - FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + File testFile = File.createTempFile(prefix, ".tmp"); + FileOutputStream tempOut = new FileOutputStream(testFile); Random random = new Random(); for (int i = 0; i < sizeInKb; i++) @@ -123,7 +120,7 @@ tempOut.write(data); } tempOut.close(); - PrivilegedFileHelper.deleteOnExit(testFile); + testFile.deleteOnExit(); // delete on test exit return testFile; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,8 +21,8 @@ import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.datamodel.InternalQName; import org.exoplatform.services.jcr.datamodel.QPath; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.Calendar; @@ -219,12 +219,12 @@ for (int i = 0; i < FILES_COUNT; i++) { - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile("testMove", random.nextInt(1024))); + TEST_FILE = createBLOBTempFile("testMove", random.nextInt(1024)).getAbsolutePath(); filesList.add(TEST_FILE); Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - is[i] = PrivilegedFileHelper.fileInputStream(TEST_FILE); + is[i] = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is[i]); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); if (log.isDebugEnabled()) @@ -269,8 +269,7 @@ { Node localBigFile = dstNode.getNode("bigFile" + i); Node contentNode = localBigFile.getNode("jcr:content"); - compareStream(PrivilegedFileHelper.fileInputStream(filesList.get(i)), contentNode.getProperty("jcr:data") - .getStream()); + compareStream(new FileInputStream(filesList.get(i)), contentNode.getProperty("jcr:data").getStream()); } } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,9 +20,9 @@ import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.core.CredentialsImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; import java.util.Calendar; @@ -65,15 +65,15 @@ Node blob = root.addNode("binaryTest"); File f; InputStream is; - blob.setProperty("blob", is = PrivilegedFileHelper.fileInputStream(f = createBLOBTempFile(2 * 1024))); // 2M + blob.setProperty("blob", is = new FileInputStream(f = createBLOBTempFile(2 * 1024))); // 2M root.save(); is.close(); - PrivilegedFileHelper.renameTo(f, new File("./sv_export_binary.bin")); + f.renameTo(new File("./sv_export_binary.bin")); File outf = new File("./sv_export_root.xml"); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(outf); + FileOutputStream out = new FileOutputStream(outf); session.exportWorkspaceSystemView(out, false, false); out.close(); } @@ -97,7 +97,7 @@ { InputStream is = ws1root.getProperty("1_common/cargo/cargo/0.5/cargo-0.5.jar/jcr:content/jcr:data").getStream(); - FileOutputStream fout = PrivilegedFileHelper.fileOutputStream("./cargo-0.5.jar"); + FileOutputStream fout = new FileOutputStream("./cargo-0.5.jar"); int r = -1; byte[] b = new byte[1024]; while ((r = is.read(b)) >= 0) @@ -119,8 +119,8 @@ p = multiv.getProperty("exojcrtest:multiValuedName"); p.getValues(); - compareStream(PrivilegedFileHelper.fileInputStream("./sv_export_binary.bin"), root.getNode("binaryTest") - .getProperty("blob").getStream()); + compareStream(new FileInputStream("./sv_export_binary.bin"), root.getNode("binaryTest").getProperty("blob") + .getStream()); } catch (ValueFormatException e) { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -32,7 +32,6 @@ import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.config.WorkspaceInitializerEntry; import org.exoplatform.services.jcr.datamodel.NodeData; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; /** * Created by The eXo Platform SAS. @@ -43,14 +42,15 @@ * @author <a href="mailto:alex.reshetnyak@exoplatform.com.ua">Alex Reshetnyak</a> * @version $Id$ */ -public class TestSVNodeDataOptimization extends JcrImplBaseTest +public class TestSVNodeDataOptimization + extends JcrImplBaseTest { - + @Override public void setUp() throws Exception { super.setUp(); - SessionImpl ses = (SessionImpl)repository.login(credentials, "ws1"); + SessionImpl ses = (SessionImpl) repository.login(credentials, "ws1"); if (ses != null) { try @@ -86,7 +86,7 @@ @Override protected void tearDown() throws Exception { - SessionImpl ses = (SessionImpl)repository.login(credentials, "ws1"); + SessionImpl ses = (SessionImpl) repository.login(credentials, "ws1"); if (ses != null) { try @@ -124,7 +124,7 @@ { //ADD content - SessionImpl ses = (SessionImpl)repository.login(credentials, "ws1"); + SessionImpl ses = (SessionImpl) repository.login(credentials, "ws1"); //Add node with sub name sibling Node nodeSNS = ses.getRootNode().addNode("node_with_sns"); @@ -143,19 +143,19 @@ ses.save(); // Cereate backup - File backup = PrivilegedFileHelper.createTempFile("full-backup", ".xml"); - PrivilegedFileHelper.deleteOnExit(backup); + File backup = File.createTempFile("full-backup", ".xml"); + backup.deleteOnExit(); - ses.exportWorkspaceSystemView(PrivilegedFileHelper.fileOutputStream(backup), false, false); + ses.exportWorkspaceSystemView(new FileOutputStream(backup), false, false); // restore to ws1_restored WorkspaceEntry ws1_restore = - makeWorkspaceEntry("ws1_restored", isMultiDB(session) ? "jdbcjcr2export3" : "jdbcjcr", backup, ses); + makeWorkspaceEntry("ws1_restored", isMultiDB(session) ? "jdbcjcr2export3" : "jdbcjcr", backup, ses); repository.configWorkspace(ws1_restore); repository.createWorkspace(ws1_restore.getName()); // check - SessionImpl backupSession = (SessionImpl)repository.login(credentials, "ws1_restored"); + SessionImpl backupSession = (SessionImpl) repository.login(credentials, "ws1_restored"); assertNotNull(backupSession); @@ -164,8 +164,8 @@ private void checkEquals(SessionImpl expected, SessionImpl actual) throws Exception { - NodeImpl srcNode = (NodeImpl)expected.getRootNode(); - NodeImpl destNode = (NodeImpl)actual.getRootNode(); + NodeImpl srcNode = (NodeImpl) expected.getRootNode(); + NodeImpl destNode = (NodeImpl) actual.getRootNode(); checkNodeEquals(srcNode, destNode); } @@ -174,7 +174,7 @@ { assertTrue(dest.equals(src)); assertEquals(src.getIndex(), dest.getIndex()); - assertEquals(((NodeData)src.getData()).getOrderNumber(), ((NodeData)dest.getData()).getOrderNumber()); + assertEquals(((NodeData) src.getData()).getOrderNumber(), ((NodeData) dest.getData()).getOrderNumber()); NodeIterator srcIterator = src.getNodes(); NodeIterator destIterator = dest.getNodes(); @@ -182,16 +182,16 @@ assertEquals(srcIterator.getSize(), destIterator.getSize()); while (srcIterator.hasNext()) - checkNodeEquals((NodeImpl)srcIterator.nextNode(), (NodeImpl)destIterator.nextNode()); + checkNodeEquals((NodeImpl) srcIterator.nextNode(), (NodeImpl) destIterator.nextNode()); } private WorkspaceEntry makeWorkspaceEntry(String name, String sourceName, File sysViewFile, SessionImpl ses) { - WorkspaceEntry ws1e = (WorkspaceEntry)ses.getContainer().getComponentInstanceOfType(WorkspaceEntry.class); + WorkspaceEntry ws1e = (WorkspaceEntry) ses.getContainer().getComponentInstanceOfType(WorkspaceEntry.class); WorkspaceEntry ws1back = new WorkspaceEntry(); ws1back.setName(name); - ws1back.setUniqueName(((RepositoryImpl)ses.getRepository()).getName() + "_" + ws1back.getName()); + ws1back.setUniqueName(((RepositoryImpl) ses.getRepository()).getName() + "_" + ws1back.getName()); ws1back.setAccessManager(ws1e.getAccessManager()); ws1back.setAutoInitializedRootNt(ws1e.getAutoInitializedRootNt()); @@ -206,7 +206,7 @@ List<SimpleParameterEntry> wieParams = new ArrayList<SimpleParameterEntry>(); wieParams - .add(new SimpleParameterEntry(SysViewWorkspaceInitializer.RESTORE_PATH_PARAMETER, sysViewFile.getPath())); + .add(new SimpleParameterEntry(SysViewWorkspaceInitializer.RESTORE_PATH_PARAMETER, sysViewFile.getPath())); wiEntry.setParameters(wieParams); @@ -216,14 +216,14 @@ ArrayList qParams = new ArrayList(); qParams.add(new SimpleParameterEntry("indexDir", "target" + File.separator + name)); QueryHandlerEntry qEntry = - new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams); + new QueryHandlerEntry("org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex", qParams); ws1back.setQueryHandler(qEntry); ArrayList params = new ArrayList(); for (Iterator i = ws1back.getContainer().getParameters().iterator(); i.hasNext();) { - SimpleParameterEntry p = (SimpleParameterEntry)i.next(); + SimpleParameterEntry p = (SimpleParameterEntry) i.next(); SimpleParameterEntry newp = new SimpleParameterEntry(p.getName(), p.getValue()); if (isMultiDB(ses) && newp.getName().equals("source-name")) @@ -237,7 +237,7 @@ } ContainerEntry ce = - new ContainerEntry("org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer", params); + new ContainerEntry("org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer", params); ws1back.setContainer(ce); return ws1back; @@ -245,11 +245,11 @@ private boolean isMultiDB(SessionImpl session) { - WorkspaceEntry ws1e = (WorkspaceEntry)session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class); + WorkspaceEntry ws1e = (WorkspaceEntry) session.getContainer().getComponentInstanceOfType(WorkspaceEntry.class); for (Iterator i = ws1e.getContainer().getParameters().iterator(); i.hasNext();) { - SimpleParameterEntry p = (SimpleParameterEntry)i.next(); + SimpleParameterEntry p = (SimpleParameterEntry) i.next(); SimpleParameterEntry newp = new SimpleParameterEntry(p.getName(), p.getValue()); if (newp.getName().equals("multi-db")) @@ -257,7 +257,7 @@ } throw new RuntimeException("Can not get property 'multi-db' in configuration on workspace '" + ws1e.getName() - + "'"); + + "'"); } } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.config.RepositoryEntry; import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.ConfigurationHelper; import org.exoplatform.services.jcr.util.IdGenerator; @@ -140,14 +139,12 @@ public void testAddWorkspaceWithIvalidVs() throws RepositoryConfigurationException, Exception { - File file = PrivilegedFileHelper.createTempFile("test", ".dat"); - PrivilegedFileHelper.deleteOnExit(file); + File file = File.createTempFile("test", ".dat"); + file.deleteOnExit(); WorkspaceEntry workspaceEntry = - helper - .getNewWs("WsInvalidVs", isDefaultWsMultiDb, wsEntry.getContainer().getParameterValue( - JDBCWorkspaceDataContainer.SOURCE_NAME), PrivilegedFileHelper.getAbsolutePath(file), wsEntry - .getContainer()); + helper.getNewWs("WsInvalidVs", isDefaultWsMultiDb, wsEntry.getContainer().getParameterValue( + JDBCWorkspaceDataContainer.SOURCE_NAME), file.getAbsolutePath(), wsEntry.getContainer()); try { helper.createWorkspace(workspaceEntry, container); @@ -161,7 +158,7 @@ } finally { - PrivilegedFileHelper.delete(file); + file.delete(); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceRestore.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -23,7 +23,6 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.ConfigurationHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -68,9 +67,9 @@ node1.setProperty("p1", 2); defSession.save(); - File content = PrivilegedFileHelper.createTempFile("data", ".xml"); - PrivilegedFileHelper.deleteOnExit(content); - OutputStream os = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(content)); + File content = File.createTempFile("data", ".xml"); + content.deleteOnExit(); + OutputStream os = new BufferedOutputStream(new FileOutputStream(content)); defSession.exportSystemView(defRoot.getPath(), os, false, false); os.close(); defSession.logout(); @@ -86,8 +85,7 @@ defRep = (RepositoryImpl)service.getDefaultRepository(); defRep.configWorkspace(workspaceEntry); - defRep.importWorkspace(workspaceEntry.getName(), new BufferedInputStream(PrivilegedFileHelper - .fileInputStream(content))); + defRep.importWorkspace(workspaceEntry.getName(), new BufferedInputStream(new FileInputStream(content))); doTestOnWorkspace(workspaceEntry.getName()); } @@ -137,9 +135,9 @@ node1.setProperty("p1", 2); defSession.save(); - File content = PrivilegedFileHelper.createTempFile("data", ".xml"); - PrivilegedFileHelper.deleteOnExit(content); - OutputStream os = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(content)); + File content = File.createTempFile("data", ".xml"); + content.deleteOnExit(); + OutputStream os = new BufferedOutputStream(new FileOutputStream(content)); defSession.exportSystemView(node1.getPath(), os, false, false); os.close(); defSession.logout(); @@ -157,8 +155,7 @@ try { - defRep.importWorkspace(workspaceEntry.getName(), new BufferedInputStream(PrivilegedFileHelper - .fileInputStream(content))); + defRep.importWorkspace(workspaceEntry.getName(), new BufferedInputStream(new FileInputStream(content))); fail(); } catch (RepositoryException e) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.apache.lucene.search.TermQuery; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -50,9 +49,9 @@ { File file = new File("src/test/resources/ArabicUTF8.txt"); - assertTrue("/test/resources/ArabicUTF8.txt not found", PrivilegedFileHelper.exists(file)); + assertTrue("/test/resources/ArabicUTF8.txt not found", file.exists()); - FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); + FileInputStream fis = new FileInputStream(file); NodeImpl node = (NodeImpl)root.addNode(fileName, "nt:file"); NodeImpl cont = (NodeImpl)node.addNode("jcr:content", "nt:resource"); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.apache.lucene.search.TermQuery; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -49,9 +48,9 @@ public void testSearchDate() throws Exception { File file = new File("src/test/resources/test.xls"); - assertTrue("/test/resources/test.xls not found", PrivilegedFileHelper.exists(file)); + assertTrue("/test/resources/test.xls not found", file.exists()); - FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); + FileInputStream fis = new FileInputStream(file); NodeImpl node = (NodeImpl)root.addNode(fileName, "nt:file"); NodeImpl cont = (NodeImpl)node.addNode("jcr:content", "nt:resource"); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestErrorMultithreading.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestErrorMultithreading.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestErrorMultithreading.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,7 @@ import org.exoplatform.services.jcr.core.CredentialsImpl; import org.exoplatform.services.jcr.impl.core.NodeImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.util.IdGenerator; import java.io.File; @@ -53,7 +53,6 @@ public static final String THREAD_NAME = "name"; - @Override public void tearDown() { @@ -85,7 +84,6 @@ this.sess = s; } - @Override public void run() { System.out.println(name + " - START"); @@ -101,7 +99,7 @@ NodeImpl cont = (NodeImpl)node.addNode("jcr:content", "nt:resource"); cont.setProperty("jcr:mimeType", "text/plain"); cont.setProperty("jcr:lastModified", Calendar.getInstance()); - fis = PrivilegedFileHelper.fileInputStream(file); + fis = new FileInputStream(file); cont.setProperty("jcr:data", fis); root.save(); System.out.println(fileName + " saved"); @@ -123,7 +121,7 @@ { Credentials credentials = new CredentialsImpl("admin", "admin".toCharArray()); - Session ss = repository.login(credentials, "ws"); + Session ss = (SessionImpl)repository.login(credentials, "ws"); Writer wr = new Writer(THREAD_NAME + t, ss); writers.add(wr); } @@ -161,7 +159,6 @@ super.setName(this.name); // super.getName() + ", " + } - @Override public void run() { System.out.println(name + " - START"); @@ -199,7 +196,7 @@ { Credentials credentials = new CredentialsImpl("admin", "admin".toCharArray()); - Session ss = repository.login(credentials, "ws"); + Session ss = (SessionImpl)repository.login(credentials, "ws"); Writer wr = new Writer(THREAD_NAME + t, ss); writers.add(wr); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -28,7 +28,6 @@ import org.exoplatform.services.document.impl.MSExcelDocumentReader; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -46,9 +45,9 @@ public void testFindFileContent() throws Exception { File file = new File("src/test/resources/test.xls"); - assertTrue("/test/resources/book.xls not found", PrivilegedFileHelper.exists(file)); + assertTrue("/test/resources/book.xls not found", file.exists()); - FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); + FileInputStream fis = new FileInputStream(file); NodeImpl node = (NodeImpl)root.addNode("excelFile", "nt:file"); NodeImpl cont = (NodeImpl)node.addNode("jcr:content", "nt:resource"); @@ -60,7 +59,7 @@ root.save(); fis.close(); - fis = PrivilegedFileHelper.fileInputStream(file); + fis = new FileInputStream(file); DocumentReaderService extr = (DocumentReaderService)session.getContainer().getComponentInstanceOfType(DocumentReaderService.class); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestErrorLog.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestErrorLog.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestErrorLog.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ import org.exoplatform.services.jcr.impl.core.query.BaseQueryTest; import org.exoplatform.services.jcr.impl.core.query.ErrorLog; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.util.HashSet; @@ -32,158 +31,132 @@ * * @version $Id: $ */ -public class TestErrorLog extends BaseQueryTest -{ - ErrorLog log; +public class TestErrorLog extends BaseQueryTest { + ErrorLog log; - File file; + File file; - private static final int SIZE = 100; + private static final int SIZE = 100; - @Override - public void setUp() throws Exception - { - super.setUp(); - file = PrivilegedFileHelper.createTempFile("error", "log"); - if (PrivilegedFileHelper.exists(file)) - { - file.delete(); - } - } + public void setUp() throws Exception { + super.setUp(); + file = File.createTempFile("error", "log"); + if (file.exists()) { + file.delete(); + } + } - @Override - public void tearDown() throws Exception - { - super.tearDown(); - log.clear(); - file.delete(); - } + public void tearDown() throws Exception { + super.tearDown(); + log.clear(); + file.delete(); + } - public void testConcurrentWrite() throws Exception - { + public void testConcurrentWrite() throws Exception { - class Loader extends Thread - { - private String name; + class Loader extends Thread { + private String name; - public Loader(String n) - { - name = n; - } + public Loader(String n) { + name = n; + } - @Override - public void run() - { - /* - * try { for (int i = 0; i < SIZE; i++) { - * log.append(ErrorLog.ADD,name + i); //System.out.println(name - * + i); } log.flush(); } catch (Exception e) { - * System.out.println(e); } - */ + public void run() { + /* + * try { for (int i = 0; i < SIZE; i++) { + * log.append(ErrorLog.ADD,name + i); //System.out.println(name + * + i); } log.flush(); } catch (Exception e) { + * System.out.println(e); } + */ - try - { - HashSet<String> add = new HashSet<String>(); - HashSet<String> rem = new HashSet<String>(); + try { + HashSet<String> add = new HashSet<String>(); + HashSet<String> rem = new HashSet<String>(); - for (int j = 0; j < 10; j++) - { - add.clear(); - for (int i = 0; i < 10; i++) - { - int el = j * 10 + i; - add.add(name + el); - } - log.writeChanges(rem, add); - } + for (int j = 0; j < 10; j++) { + add.clear(); + for (int i = 0; i < 10; i++) { + int el = j * 10 + i; + add.add(name + el); + } + log.writeChanges(rem, add); + } - } - catch (Exception e) - { - System.out.println(e); - } - } - } + } catch (Exception e) { + System.out.println(e); + } + } + } - log = new ErrorLog(file, SearchIndex.DEFAULT_ERRORLOG_FILE_SIZE); + log = new ErrorLog(file, SearchIndex.DEFAULT_ERRORLOG_FILE_SIZE); - Thread one = new Loader("first"); - Thread two = new Loader("second"); - one.start(); - two.start(); - one.join(); - two.join(); + Thread one = new Loader("first"); + Thread two = new Loader("second"); + one.start(); + two.start(); + one.join(); + two.join(); - List<String> list = log.readList(); + List<String> list = log.readList(); - int lost_first = 0; - int lost_second = 0; - for (int i = 0; i < SIZE; i++) - { - String firstname = ErrorLog.ADD + " first" + i; - String secondname = ErrorLog.ADD + " second" + i; - int ffinded = 0; - int sfinded = 0; - for (int j = 0; j < list.size(); j++) - { - if (list.get(j).equals(firstname)) - { - ffinded++; - } - if (list.get(j).equals(secondname)) - { - sfinded++; - } - } - if (ffinded == 0) - { - System.out.println(firstname + " NOT FINDED"); - } - if (ffinded > 1) - { - System.out.println(firstname + " DUPLICATED"); - } - if (sfinded == 0) - { - System.out.println(secondname + " NOT FINDED"); - } - if (sfinded > 1) - { - System.out.println(secondname + " DUPLICATED"); - } - } + int lost_first = 0; + int lost_second = 0; + for (int i = 0; i < SIZE; i++) { + String firstname = ErrorLog.ADD + " first" + i; + String secondname = ErrorLog.ADD + " second" + i; + int ffinded = 0; + int sfinded = 0; + for (int j = 0; j < list.size(); j++) { + if (list.get(j).equals(firstname)) { + ffinded++; + } + if (list.get(j).equals(secondname)) { + sfinded++; + } + } + if (ffinded == 0) { + System.out.println(firstname + " NOT FINDED"); + } + if (ffinded > 1) { + System.out.println(firstname + " DUPLICATED"); + } + if (sfinded == 0) { + System.out.println(secondname + " NOT FINDED"); + } + if (sfinded > 1) { + System.out.println(secondname + " DUPLICATED"); + } + } - assertEquals("There is mismatch of expected writed messages count ", 200, list.size()); - assertEquals("First thread has lost apdates", 0, lost_first); - assertEquals("Second thread has lost apdates", 0, lost_second); - } + assertEquals("There is mismatch of expected writed messages count ", + 200, list.size()); + assertEquals("First thread has lost apdates", 0, lost_first); + assertEquals("Second thread has lost apdates", 0, lost_second); + } - public void testExctractNotifyList() throws Exception - { - log = new ErrorLog(file, SearchIndex.DEFAULT_ERRORLOG_FILE_SIZE); + public void testExctractNotifyList() throws Exception { + log = new ErrorLog(file, SearchIndex.DEFAULT_ERRORLOG_FILE_SIZE); - Set<String> removed = new HashSet<String>(); - Set<String> added = new HashSet<String>(); + Set<String> removed = new HashSet<String>(); + Set<String> added = new HashSet<String>(); - for (int i = 0; i < 10; i++) - { - added.add("uuidadd" + i); - } + for (int i = 0; i < 10; i++) { + added.add("uuidadd" + i); + } - for (int i = 0; i < 5; i++) - { - removed.add("uuidrem" + i); - } + for (int i = 0; i < 5; i++) { + removed.add("uuidrem" + i); + } - log.writeChanges(removed, added); + log.writeChanges(removed, added); - Set<String> rem = new HashSet<String>(); - Set<String> add = new HashSet<String>(); + Set<String> rem = new HashSet<String>(); + Set<String> add = new HashSet<String>(); - log.readChanges(rem, add); + log.readChanges(rem, add); - assertTrue(rem.containsAll(removed)); - assertTrue(add.containsAll(added)); - } + assertTrue(rem.containsAll(removed)); + assertTrue(add.containsAll(added)); + } } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestFileBasedNamespaceMappings.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -17,13 +17,10 @@ package org.exoplatform.services.jcr.impl.core.query.lucene; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; - 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; /** @@ -52,10 +49,9 @@ assertEquals("mix", namereg.getNamespacePrefixByURI("http://www.jcp.org/jcr/mix/1.0")); } - @Override public void setUp() throws Exception { - test_mapp = PrivilegedFileHelper.createTempFile("temp", "mapping"); + test_mapp = File.createTempFile("temp", "mapping"); // Fill the namespace mappings file by prefix uri pairs @@ -71,16 +67,15 @@ props.setProperty("xs", "http://www.w3.org/2001/XMLSchema"); props.setProperty("fn", "http://www.w3.org/2004/10/xpath-functions"); - props.store(PrivilegedFileHelper.fileOutputStream(test_mapp), ""); + props.store(new FileOutputStream(test_mapp), ""); props.clear(); - PrivilegedFileHelper.deleteOnExit(test_mapp); + test_mapp.deleteOnExit(); } - @Override protected void tearDown() throws Exception { - PrivilegedFileHelper.delete(test_mapp); + test_mapp.delete(); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/BaseSecurityTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -42,16 +42,13 @@ public abstract class BaseSecurityTest extends BaseStandaloneTest { - @Override public void setUp() throws Exception { super.setUp(); - SecurityManager security = System.getSecurityManager(); assertNotNull("SecurityManager must be ON.", security); } - @Override public String getRepositoryName() { return "db1"; @@ -144,13 +141,11 @@ protected static final PermissionCollection ALL = new PermissionCollection() { - @Override public boolean implies(Permission permission) { return true; } - @Override public Enumeration<Permission> elements() { return new Enumeration<Permission>() @@ -170,7 +165,6 @@ }; } - @Override public void add(Permission permission) { } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -23,7 +23,6 @@ import org.exoplatform.services.jcr.core.ManageableRepository; import org.exoplatform.services.jcr.impl.dataflow.serialization.TesterItemsPersistenceListener; -import java.io.FileNotFoundException; import java.security.AccessControlException; import java.security.PrivilegedExceptionAction; @@ -35,7 +34,7 @@ { private static String testWorkspaceName = "testWorkspace"; - public void testGetSystemSessionSuccess() throws FileNotFoundException + public void testGetSystemSessionSuccess() { PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>() { @@ -44,6 +43,7 @@ repository.getSystemSession(); return null; } + }; try { @@ -51,7 +51,6 @@ } catch (AccessControlException ace) { - ace.printStackTrace(); fail("Must be able get system session. We are under static permissions"); } catch (Throwable t) @@ -169,7 +168,6 @@ } catch (AccessControlException ace) { - ace.printStackTrace(); fail("Must be able config workspace. We are under static permissions"); } catch (Throwable t) @@ -234,7 +232,6 @@ } catch (AccessControlException ace) { - ace.printStackTrace(); fail("Must be able create workspace. We are under static permissions"); } catch (Throwable t) Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestByteArrayPersistedValueDataSerialization.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestByteArrayPersistedValueDataSerialization.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestByteArrayPersistedValueDataSerialization.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import java.io.ObjectOutputStream; import org.exoplatform.services.jcr.JcrImplBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; /** * Created by The eXo Platform SAS. @@ -36,38 +35,39 @@ * @author <a href="mailto:alex.reshetnyak@exoplatform.com.ua">Alex Reshetnyak</a> * @version $Id$ */ -public class TestByteArrayPersistedValueDataSerialization extends JcrImplBaseTest +public class TestByteArrayPersistedValueDataSerialization + extends JcrImplBaseTest { public void testBAPVDSerialization() throws Exception { - - byte[] buf = new byte[124578]; - - for (int i = 0; i < buf.length; i++) - buf[i] = (byte)(Math.random() * 256); - + + byte []buf = new byte[124578]; + + for (int i = 0; i< buf.length; i++) + buf[i] = (byte) (Math.random()*256); + // Create ValueData instants ByteArrayPersistedValueData vd = new ByteArrayPersistedValueData(11, buf); - File out = PrivilegedFileHelper.createTempFile("test", ".data"); - PrivilegedFileHelper.deleteOnExit(out); + File out = File.createTempFile("test", ".data"); + out.deleteOnExit(); //serialize - ObjectOutputStream oos = new ObjectOutputStream(PrivilegedFileHelper.fileOutputStream(out)); + ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(out)); oos.writeObject(vd); oos.flush(); oos.close(); //deserialize - ObjectInputStream ois = new ObjectInputStream(PrivilegedFileHelper.fileInputStream(out)); - ByteArrayPersistedValueData deserializedValueData = (ByteArrayPersistedValueData)ois.readObject(); + ObjectInputStream ois = new ObjectInputStream(new FileInputStream(out)); + ByteArrayPersistedValueData deserializedValueData = (ByteArrayPersistedValueData) ois.readObject(); //check assertNotNull(deserializedValueData); assertEquals(vd.getLength(), deserializedValueData.getLength()); assertEquals(vd.getOrderNumber(), deserializedValueData.getOrderNumber()); - + for (int j = 0; j < vd.getAsByteArray().length; j++) - assertEquals(vd.getAsByteArray()[j], deserializedValueData.getAsByteArray()[j]); + assertEquals(vd.getAsByteArray()[j], deserializedValueData.getAsByteArray()[j]); } } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,7 +21,6 @@ import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.impl.util.io.SwapFile; import java.io.File; @@ -87,7 +86,7 @@ testCleaner = new FileCleaner(CLEANER_TIMEOUT); SwapFile sf = SwapFile.get(parentDir, FILE_NAME); - FileOutputStream fout = PrivilegedFileHelper.fileOutputStream(sf); + FileOutputStream fout = new FileOutputStream(sf); fout.write("testFileCleaned".getBytes()); fout.close(); sf.spoolDone(); @@ -103,9 +102,9 @@ testCleaner.halt(); testCleaner = null; - if (PrivilegedFileHelper.exists(testFile)) + if (testFile.exists()) { - PrivilegedFileHelper.delete(testFile); + testFile.delete(); } TestSwapFile.cleanShare(); @@ -121,7 +120,7 @@ public void testFileCleaned() throws InterruptedException { - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); cleanableValueData = null; // CleanableVD dies @@ -131,20 +130,20 @@ Thread.yield(); System.gc(); - assertFalse(PrivilegedFileHelper.exists(testFile)); // file released and deleted + assertFalse(testFile.exists()); // file released and deleted } public void testSharedFileNotCleaned() throws InterruptedException, IOException { - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); CleanableFilePersistedValueData cfvd2 = new CleanableFilePersistedValueData(1, SwapFile.get(parentDir, FILE_NAME), testCleaner); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); cleanableValueData = null; // CleanableVD dies but another instance points swapped file @@ -154,7 +153,7 @@ Thread.yield(); System.gc(); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); // clean ValueData cfvd2 = null; @@ -165,19 +164,19 @@ Thread.yield(); System.gc(); - assertFalse(PrivilegedFileHelper.exists(testFile)); + assertFalse(testFile.exists()); } public void testTransientFileNotCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); trvd = null; // TransientVD dies @@ -187,19 +186,19 @@ Thread.yield(); System.gc(); - assertTrue(PrivilegedFileHelper.exists(testFile)); // but Swapped CleanableVD lives and uses the file + assertTrue(testFile.exists()); // but Swapped CleanableVD lives and uses the file } public void testTransientFileCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); cleanableValueData = null; // CleanableVD dies but TransientVD still uses swapped file @@ -209,7 +208,7 @@ Thread.yield(); System.gc(); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); trvd = null; // TransientVD dies @@ -219,13 +218,13 @@ Thread.yield(); System.gc(); - assertFalse(PrivilegedFileHelper.exists(testFile)); // swapped file deleted + assertFalse(testFile.exists()); // swapped file deleted } public void testTransientSharedFileCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); @@ -233,7 +232,7 @@ // file shared with TransientVD TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); // 1st CleanableVD die cleanableValueData = null; @@ -247,7 +246,7 @@ // file shared with third CleanableVD, i.e. file still exists (aquired by TransientVD) CleanableFilePersistedValueData cfvd2 = new CleanableFilePersistedValueData(1, SwapFile.get(parentDir, FILE_NAME), testCleaner); - assertTrue(PrivilegedFileHelper.exists(testFile)); + assertTrue(testFile.exists()); trvd = null; // TransientVD dies @@ -257,7 +256,7 @@ Thread.yield(); System.gc(); - assertTrue(PrivilegedFileHelper.exists(testFile)); // still exists, aquired by 2nd CleanableVD + assertTrue(testFile.exists()); // still exists, aquired by 2nd CleanableVD cfvd2 = null; // 2nd CleanableVD dies @@ -267,7 +266,7 @@ Thread.yield(); System.gc(); - assertFalse(PrivilegedFileHelper.exists(testFile)); // file should be deleted + assertFalse(testFile.exists()); // file should be deleted } } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationLogTestLoad.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,10 +20,10 @@ import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; import org.exoplatform.services.jcr.impl.core.NodeImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; +import java.io.FileOutputStream; import java.util.Calendar; import java.util.List; @@ -43,7 +43,7 @@ TesterItemsPersistenceListener pl = new TesterItemsPersistenceListener(this.session); File file = this.createBLOBTempFile(310); - FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); + FileInputStream fis = new FileInputStream(file); NodeImpl node = (NodeImpl)root.addNode("file", "nt:file"); NodeImpl cont = (NodeImpl)node.addNode("jcr:content", "nt:resource"); @@ -56,7 +56,7 @@ fis.close(); - PrivilegedFileHelper.delete(file); + file.delete(); List<TransactionChangesLog> logs = pl.pushChanges(); @@ -67,8 +67,8 @@ long jcrwrite = 0; long jcrread = 0; - File jcrfile = PrivilegedFileHelper.createTempFile("jcr", "test"); - ObjectWriterImpl jcrout = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(jcrfile)); + File jcrfile = File.createTempFile("jcr", "test"); + ObjectWriterImpl jcrout = new ObjectWriterImpl(new FileOutputStream(jcrfile)); System.out.println(" WRITE START"); long t1 = System.currentTimeMillis(); @@ -81,7 +81,7 @@ System.out.println(" READ START"); // deserialize - ObjectReaderImpl jcrin = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(jcrfile)); + ObjectReaderImpl jcrin = new ObjectReaderImpl(new FileInputStream(jcrfile)); // List<TransactionChangesLog> readed = new ArrayList<TransactionChangesLog>(); long t3 = System.currentTimeMillis(); @@ -89,7 +89,7 @@ for (int i = 0; i < iter; i++) { TransactionChangesLogReader rdr = new TransactionChangesLogReader(fileCleaner, maxBufferSize, holder); - TransactionChangesLog obj = rdr.read(jcrin); + TransactionChangesLog obj = (TransactionChangesLog)rdr.read(jcrin); // readed.add(obj); } @@ -107,8 +107,8 @@ long javaWrite = 0; long javaRead = 0; - File jfile = PrivilegedFileHelper.createTempFile("java", "test"); - ObjectOutputStream jout = new ObjectOutputStream(PrivilegedFileHelper.fileOutputStream(jfile)); + File jfile = File.createTempFile("java", "test"); + ObjectOutputStream jout = new ObjectOutputStream(new FileOutputStream(jfile)); it = logs.iterator(); @@ -122,7 +122,7 @@ // deserialize System.out.println(" READ START"); - ObjectInputStream jin = new ObjectInputStream(PrivilegedFileHelper.fileInputStream(jfile)); + ObjectInputStream jin = new ObjectInputStream(new FileInputStream(jfile)); long t4 = System.currentTimeMillis(); @@ -136,7 +136,7 @@ System.out.println(" JCR s- " + (jcrwrite)); // System.out.println(" Java s- " + (javaWrite)); - System.out.println(" JCR file size - " + PrivilegedFileHelper.length(jcrfile)); + System.out.println(" JCR file size - " + jcrfile.length()); // System.out.println(" Java file size - " + jfile.length()); System.out.println(" JCR des- " + (jcrread)); // System.out.println(" Java des- " + (javaRead)); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JCRSerializationVSJavaSerializationTestLoad.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,11 +20,13 @@ 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; @@ -72,8 +74,8 @@ it = list.iterator(); - File jcrfile = PrivilegedFileHelper.createTempFile("jcr", "test"); - ObjectWriterImpl jcrout = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(jcrfile)); + File jcrfile = File.createTempFile("jcr", "test"); + ObjectWriterImpl jcrout = new ObjectWriterImpl(new FileOutputStream(jcrfile)); long t1 = System.currentTimeMillis(); PersistedValueDataWriter wr = new PersistedValueDataWriter(); @@ -87,7 +89,7 @@ jcrout.close(); // deserialize - ObjectReaderImpl jcrin = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(jcrfile)); + ObjectReaderImpl jcrin = new ObjectReaderImpl(new FileInputStream(jcrfile)); long t3 = System.currentTimeMillis(); @@ -100,7 +102,7 @@ jcrread += t3; jcrin.close(); - PrivilegedFileHelper.delete(jcrfile); + jcrfile.delete(); } @@ -109,8 +111,8 @@ long javaRead = 0; for (int j = 0; j < iterations; j++) { - File jfile = PrivilegedFileHelper.createTempFile("java", "test"); - ObjectOutputStream jout = new ObjectOutputStream(PrivilegedFileHelper.fileOutputStream(jfile)); + File jfile = File.createTempFile("java", "test"); + ObjectOutputStream jout = new ObjectOutputStream(new FileOutputStream(jfile)); it = list.iterator(); long t2 = System.currentTimeMillis(); @@ -123,7 +125,7 @@ jout.close(); // deserialize - ObjectInputStream jin = new ObjectInputStream(PrivilegedFileHelper.fileInputStream(jfile)); + ObjectInputStream jin = new ObjectInputStream(new FileInputStream(jfile)); it = list.iterator(); long t4 = System.currentTimeMillis(); @@ -135,7 +137,7 @@ javaRead += t4; jin.close(); - PrivilegedFileHelper.delete(jfile); + jfile.delete(); } System.out.println(" JCR s- " + (jcrwrite / iterations)); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JcrImplSerializationBaseTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JcrImplSerializationBaseTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/JcrImplSerializationBaseTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -46,7 +46,6 @@ import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.StreamPersistedValueData; import org.exoplatform.services.jcr.impl.storage.value.fs.operations.ValueFileIOHelper; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.storage.value.ValueIOChannel; /** @@ -104,8 +103,8 @@ protected File serializeLogs(List<TransactionChangesLog> logs) throws IOException, UnknownClassIdException { - File jcrfile = PrivilegedFileHelper.createTempFile("jcr", "test"); - ObjectWriterImpl jcrout = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(jcrfile)); + File jcrfile = File.createTempFile("jcr", "test"); + ObjectWriterImpl jcrout = new ObjectWriterImpl(new FileOutputStream(jcrfile)); TransactionChangesLogWriter wr = new TransactionChangesLogWriter(); for (TransactionChangesLog tcl : logs) @@ -121,7 +120,7 @@ protected List<TransactionChangesLog> deSerializeLogs(File jcrfile) throws IOException, UnknownClassIdException { - ObjectReaderImpl jcrin = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(jcrfile)); + ObjectReaderImpl jcrin = new ObjectReaderImpl(new FileInputStream(jcrfile)); List<TransactionChangesLog> readed = new ArrayList<TransactionChangesLog>(); @@ -130,7 +129,7 @@ while (true) { TransactionChangesLog obj = - (new TransactionChangesLogReader(fileCleaner, maxBufferSize, holder)).read(jcrin); + (TransactionChangesLog)(new TransactionChangesLogReader(fileCleaner, maxBufferSize, holder)).read(jcrin); // TransactionChangesLog obj = new TransactionChangesLog(); // obj.readObject(jcrin); readed.add(obj); @@ -140,7 +139,8 @@ { // ok } - + + //Imitation of save. imitationSave(readed); @@ -159,37 +159,34 @@ for (TransactionChangesLog tLog : readed) { ChangesLogIterator it = tLog.getLogIterator(); - - while (it.hasNextLog()) + + while (it.hasNextLog()) { PlainChangesLog pLog = it.nextLog(); - + for (ItemState state : pLog.getAllStates()) { ItemData itemData = state.getData(); - + if (!itemData.isNode()) { PropertyData propData = (PropertyData)itemData; - - for (ValueData valueData : propData.getValues()) + + for(ValueData valueData : propData.getValues()) { - if (valueData instanceof StreamPersistedValueData) - { + if (valueData instanceof StreamPersistedValueData) { // imitation of JCR save - if (((StreamPersistedValueData)valueData).getTempFile() != null) + if (((StreamPersistedValueData) valueData).getTempFile() != null) { - ((StreamPersistedValueData)valueData).setPersistedFile(((StreamPersistedValueData)valueData) - .getTempFile()); + ((StreamPersistedValueData) valueData).setPersistedFile(((StreamPersistedValueData) valueData).getTempFile()); } else { - File file = PrivilegedFileHelper.createTempFile("tempFile", "tmp"); - PrivilegedFileHelper.deleteOnExit(file); - - copy(((StreamPersistedValueData)valueData).getStream(), PrivilegedFileHelper - .fileOutputStream(file)); - ((StreamPersistedValueData)valueData).setPersistedFile(file); + File file = File.createTempFile("tempFile", "tmp"); + file.deleteOnExit(); + + copy(((StreamPersistedValueData) valueData).getStream(), new FileOutputStream(file)); + ((StreamPersistedValueData) valueData).setPersistedFile(file); } } } @@ -198,7 +195,7 @@ } } } - + protected long copy(InputStream in, OutputStream out) throws IOException { // compare classes as in Java6 Channels.newChannel(), Java5 has a bug in newChannel(). 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/MultipleDeserializationTestLoad.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,10 +25,11 @@ import org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -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.util.ArrayList; import java.util.Calendar; @@ -124,18 +125,18 @@ root.save(); // Serialize with JCR - File jcrfile = PrivilegedFileHelper.createTempFile("jcr", "test"); - ObjectWriterImpl jcrout = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(jcrfile)); + File jcrfile = File.createTempFile("jcr", "test"); + ObjectWriterImpl jcrout = new ObjectWriterImpl(new FileOutputStream(jcrfile)); TransactionChangesLog l = pl.pushChanges().get(0); TransactionChangesLogWriter wr = new TransactionChangesLogWriter(); wr.write(jcrout, l); jcrout.close(); - ObjectReaderImpl jcrin = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(jcrfile)); + ObjectReaderImpl jcrin = new ObjectReaderImpl(new FileInputStream(jcrfile)); long jcrfread = System.currentTimeMillis(); TransactionChangesLog mlog = - (new TransactionChangesLogReader(fileCleaner, maxBufferSize, holder)).read(jcrin); + (TransactionChangesLog)(new TransactionChangesLogReader(fileCleaner, maxBufferSize, holder)).read(jcrin); //TransactionChangesLog mlog = new TransactionChangesLog(); //mlog.readObject(jcrin); jcrfread = System.currentTimeMillis() - jcrfread; @@ -148,15 +149,15 @@ for (int j = 0; j < iterations; j++) { // deserialize - jcrin = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(jcrfile)); + jcrin = new ObjectReaderImpl(new FileInputStream(jcrfile)); long t3 = System.currentTimeMillis(); - TransactionChangesLog log = rdr.read(jcrin); + TransactionChangesLog log = (TransactionChangesLog)rdr.read(jcrin); t3 = System.currentTimeMillis() - t3; jcrread += t3; jcrin.close(); } - PrivilegedFileHelper.delete(jcrfile); + jcrfile.delete(); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestEOFException.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,10 +20,11 @@ import org.exoplatform.services.jcr.dataflow.serialization.ObjectReader; import org.exoplatform.services.jcr.dataflow.serialization.ObjectWriter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.EOFException; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.util.Random; @@ -40,13 +41,13 @@ { final byte[] buffer = createBLOBTempData(45); - File test = PrivilegedFileHelper.createTempFile("testEOF", ""); - ObjectWriter ow = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(test)); + File test = File.createTempFile("testEOF", ""); + ObjectWriter ow = new ObjectWriterImpl(new FileOutputStream(test)); ow.write(buffer); ow.close(); - ObjectReader or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(test)); + ObjectReader or = new ObjectReaderImpl(new FileInputStream(test)); byte[] buf = new byte[buffer.length]; try @@ -64,19 +65,19 @@ or.close(); } - PrivilegedFileHelper.delete(test); + test.delete(); } public void testReadBoolean() throws Exception { - File test = PrivilegedFileHelper.createTempFile("testEOF", ""); - ObjectWriter ow = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(test)); + File test = File.createTempFile("testEOF", ""); + ObjectWriter ow = new ObjectWriterImpl(new FileOutputStream(test)); ow.writeBoolean(true); ow.close(); - ObjectReader or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(test)); + ObjectReader or = new ObjectReaderImpl(new FileInputStream(test)); boolean b = or.readBoolean(); try @@ -93,19 +94,19 @@ or.close(); } - PrivilegedFileHelper.delete(test); + test.delete(); } public void testReadInt() throws Exception { - File test = PrivilegedFileHelper.createTempFile("testEOF", ""); - ObjectWriter ow = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(test)); + File test = File.createTempFile("testEOF", ""); + ObjectWriter ow = new ObjectWriterImpl(new FileOutputStream(test)); ow.writeInt(24); ow.close(); - ObjectReader or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(test)); + ObjectReader or = new ObjectReaderImpl(new FileInputStream(test)); int b = or.readInt(); assertEquals(24, b); @@ -123,19 +124,19 @@ or.close(); } - PrivilegedFileHelper.delete(test); + test.delete(); } public void testReadLong() throws Exception { - File test = PrivilegedFileHelper.createTempFile("testEOF", ""); - ObjectWriter ow = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(test)); + File test = File.createTempFile("testEOF", ""); + ObjectWriter ow = new ObjectWriterImpl(new FileOutputStream(test)); ow.writeLong(24); ow.close(); - ObjectReader or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(test)); + ObjectReader or = new ObjectReaderImpl(new FileInputStream(test)); long b = or.readLong(); assertEquals(24, b); @@ -153,7 +154,7 @@ or.close(); } - PrivilegedFileHelper.delete(test); + test.delete(); } protected byte[] createBLOBTempData(int size) throws IOException Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationCopyMove.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationCopyMove.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationCopyMove.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.dataflow.serialization; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -121,13 +120,13 @@ TesterItemsPersistenceListener pl = new TesterItemsPersistenceListener(this.session); File tempFile = this.createBLOBTempFile(160); - PrivilegedFileHelper.deleteOnExit(tempFile); + tempFile.deleteOnExit(); - log.info("MOVE: file size = " + PrivilegedFileHelper.length(tempFile) + " bytes"); + log.info("MOVE: file size = " + tempFile.length() + " bytes"); Node file = root.addNode("testMove_", "nt:folder").addNode("childNode2", "nt:file"); Node contentNode = file.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile)); + contentNode.setProperty("jcr:data", new FileInputStream(tempFile)); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); session.save(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationStream.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationStream.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationStream.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.dataflow.serialization; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -51,7 +50,7 @@ Node cool = test.addNode("nnn", "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile)); + contentNode.setProperty("jcr:data", new FileInputStream(tempFile)); contentNode.setProperty("jcr:mimeType", "application/octet-stream"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); session.save(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationVersionRestore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationVersionRestore.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestJCRSerializationVersionRestore.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.dataflow.serialization; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -91,16 +90,16 @@ { TesterItemsPersistenceListener pl = new TesterItemsPersistenceListener(this.session); - File tempFile = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - File tempFile2 = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - File tempFile3 = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - PrivilegedFileHelper.deleteOnExit(tempFile); - PrivilegedFileHelper.deleteOnExit(tempFile2); - PrivilegedFileHelper.deleteOnExit(tempFile3); + File tempFile = File.createTempFile("tempFile", "doc"); + File tempFile2 = File.createTempFile("tempFile", "doc"); + File tempFile3 = File.createTempFile("tempFile", "doc"); + tempFile.deleteOnExit(); + tempFile2.deleteOnExit(); + tempFile3.deleteOnExit(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(tempFile); - FileOutputStream fos2 = PrivilegedFileHelper.fileOutputStream(tempFile2); - FileOutputStream fos3 = PrivilegedFileHelper.fileOutputStream(tempFile3); + FileOutputStream fos = new FileOutputStream(tempFile); + FileOutputStream fos2 = new FileOutputStream(tempFile2); + FileOutputStream fos3 = new FileOutputStream(tempFile3); String content = "this is the content #1"; String content2 = "this is the content #2_"; @@ -117,13 +116,13 @@ fos2.close(); fos3.close(); - log.info("FILE for VERVION #1 : file size = " + PrivilegedFileHelper.length(tempFile) + " bytes"); - log.info("FILE for VERVION #2 : file size = " + PrivilegedFileHelper.length(tempFile2) + " bytes"); - log.info("FILE for VERVION #3 : file size = " + PrivilegedFileHelper.length(tempFile3) + " bytes"); + log.info("FILE for VERVION #1 : file size = " + tempFile.length() + " bytes"); + log.info("FILE for VERVION #2 : file size = " + tempFile2.length() + " bytes"); + log.info("FILE for VERVION #3 : file size = " + tempFile3.length() + " bytes"); Node srcVersionNode = root.addNode("nt_file_node", "nt:file"); Node contentNode = srcVersionNode.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile)); + contentNode.setProperty("jcr:data", new FileInputStream(tempFile)); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); srcVersionNode.addMixin("mix:versionable"); @@ -135,14 +134,14 @@ session.save(); srcVersion.checkout(); - srcVersionNode.getNode("jcr:content").setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile2)); + srcVersionNode.getNode("jcr:content").setProperty("jcr:data", new FileInputStream(tempFile2)); session.save(); srcVersion.checkin(); session.save(); srcVersion.checkout(); - srcVersionNode.getNode("jcr:content").setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile3)); + srcVersionNode.getNode("jcr:content").setProperty("jcr:data", new FileInputStream(tempFile3)); session.save(); Version baseVersion = srcVersion.getBaseVersion(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/serialization/TestPropsDeserialization.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.dataflow.serialization; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -48,7 +47,7 @@ Node srcVersionNode = root.addNode("nt_file_node", "nt:file"); Node contentNode = srcVersionNode.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(content1)); + contentNode.setProperty("jcr:data", new FileInputStream(content1)); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); srcVersionNode.addMixin("mix:versionable"); @@ -66,12 +65,12 @@ for (int i = 0; i < logs.size(); i++) checkIterator(logs.get(i).getAllStates().iterator(), destLog.get(i).getAllStates().iterator()); - + // set value pl = new TesterItemsPersistenceListener(this.session); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(content2)); + contentNode.setProperty("jcr:data", new FileInputStream(content2)); session.save(); - + // check 2 logs = pl.pushChanges(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.ConfigurationHelper; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; @@ -33,6 +32,7 @@ import java.io.BufferedInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -172,7 +172,7 @@ Node localBigFile = testLocalBigFiles.addNode("bigFile" + j, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -194,8 +194,8 @@ Node content = lbf.getNode("jcr:content"); // comparing with source file - compareStream(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(blobFiles.get(j))), content - .getProperty("jcr:data").getStream()); + compareStream(new BufferedInputStream(new FileInputStream(blobFiles.get(j))), content.getProperty( + "jcr:data").getStream()); } n1.remove(); currenSession.save(); @@ -228,8 +228,8 @@ // create test file byte[] data = new byte[1024]; // 1Kb - File testFile = PrivilegedFileHelper.createTempFile(IdGenerator.generate(), ".tmp"); - FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + File testFile = File.createTempFile(IdGenerator.generate(), ".tmp"); + FileOutputStream tempOut = new FileOutputStream(testFile); Random random = new Random(); for (int i = 0; i < sizeInb; i += 1024) @@ -245,9 +245,8 @@ tempOut.write(data); } tempOut.close(); - PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " - + PrivilegedFileHelper.length(testFile)); + testFile.deleteOnExit(); // delete on test exit + log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + testFile.length()); return testFile; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/fs/TestRandomValueIO.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,11 +18,9 @@ */ package org.exoplatform.services.jcr.impl.storage.fs; -import org.exoplatform.commons.utils.MimeTypeResolver; import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.core.value.EditableBinaryValue; import org.exoplatform.services.jcr.core.value.ReadableBinaryValue; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -62,7 +60,7 @@ if (testFile == null) { testFile = createBLOBTempFile(this.getClass().getSimpleName() + "_", 2 * 1024); // 2M - PrivilegedFileHelper.deleteOnExit(testFile); + testFile.deleteOnExit(); } root.getNodes(); @@ -82,7 +80,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); @@ -98,7 +96,7 @@ { // the value obtained by getXXX must be same as on setProperty() - compareStream(PrivilegedFileHelper.fileInputStream(testFile), testRoot.getProperty(pname).getStream()); + compareStream(new FileInputStream(testFile), testRoot.getProperty(pname).getStream()); // apply edited ExtendetValue to the Property p.setValue(exv); @@ -125,7 +123,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); testRoot.save(); @@ -143,7 +141,7 @@ { // the value obtained by getXXX must be same as on setProperty() - compareStream(PrivilegedFileHelper.fileInputStream(testFile), testRoot.getProperty(pname).getStream()); + compareStream(new FileInputStream(testFile), testRoot.getProperty(pname).getStream()); // apply edited ExtendetValue to the Property p.setValue(exv); @@ -170,7 +168,7 @@ // create property String pname = "file@" + testFile.getName(); - testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + testRoot.setProperty(pname, new FileInputStream(testFile)); testRoot.save(); @@ -189,7 +187,7 @@ { // the value obtained by getXXX must be same as on setProperty() - compareStream(PrivilegedFileHelper.fileInputStream(testFile), testRoot.getProperty(pname).getStream()); + compareStream(new FileInputStream(testFile), testRoot.getProperty(pname).getStream()); // apply edited ExtendetValue to the Property testRoot.setProperty(pname, exv); @@ -217,7 +215,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); @@ -270,7 +268,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); @@ -350,7 +348,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); @@ -403,7 +401,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); String update1String = "update#1"; @@ -424,8 +422,7 @@ // test after save // first 2M of stream data must be same as on setProperty() - compareStream(PrivilegedFileHelper.fileInputStream(testFile), testRoot.getProperty(pname).getStream(), 0, 0, - PrivilegedFileHelper.length(testFile)); + compareStream(new FileInputStream(testFile), testRoot.getProperty(pname).getStream(), 0, 0, testFile.length()); compareStream(new ByteArrayInputStream(update1String.getBytes()), testRoot.getProperty(pname).getStream(), 0, pos, update1String.length()); @@ -452,15 +449,15 @@ long fmem = Runtime.getRuntime().freeMemory(); - exv.update(PrivilegedFileHelper.fileInputStream(testFile), PrivilegedFileHelper.length(testFile), pos); + exv.update(new FileInputStream(testFile), testFile.length(), pos); long fmemAfter = Runtime.getRuntime().freeMemory(); - if ((fmemAfter - fmem) >= (pos + PrivilegedFileHelper.length(testFile))) + if ((fmemAfter - fmem) >= (pos + testFile.length())) log.warn("Free memory must not be increased on value of the new Value size but does. Was " + fmem + " current " + fmemAfter); - assertEquals("Value data length must be increased ", pos + PrivilegedFileHelper.length(testFile), exv.getLength()); + assertEquals("Value data length must be increased ", pos + testFile.length(), exv.getLength()); // apply to the Property and save p.setValue(exv); @@ -468,12 +465,11 @@ EditableBinaryValue newexv = (EditableBinaryValue)testRoot.getProperty(pname).getValue(); - assertEquals("Value data length must be increased ", pos + PrivilegedFileHelper.length(testFile), newexv - .getLength()); + assertEquals("Value data length must be increased ", pos + testFile.length(), newexv.getLength()); // update inside the big data int npos = 5; - newexv.update(PrivilegedFileHelper.fileInputStream(testFile), PrivilegedFileHelper.length(testFile), npos); + newexv.update(new FileInputStream(testFile), testFile.length(), npos); // apply to the Property and save p.setValue(newexv); @@ -484,8 +480,7 @@ assertEquals("Value content is wrong ", content.substring(0, npos), new String(buff)); - compareStream(PrivilegedFileHelper.fileInputStream(testFile), testRoot.getProperty(pname).getStream(), 0, npos, - PrivilegedFileHelper.length(testFile)); + compareStream(new FileInputStream(testFile), testRoot.getProperty(pname).getStream(), 0, npos, testFile.length()); } public void testAddLength_BigValue() throws Exception @@ -493,7 +488,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); long pos = 3 * 1024 * 1024; @@ -515,7 +510,7 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); long pos = 1024 * 1024; @@ -626,10 +621,10 @@ // create property String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); - long pos = exv.getLength() - (PrivilegedFileHelper.length(testFile) - 20); + long pos = exv.getLength() - (testFile.length() - 20); exv.setLength(pos); @@ -684,11 +679,7 @@ Node createdNodeRef = testRoot.addNode(name, type); Node dataNode = createdNodeRef.addNode("jcr:content", "nt:resource"); - MimeTypeResolver mimetypeResolver = new MimeTypeResolver(); - mimetypeResolver.setDefaultMimeType("application/zip"); - String mimeType = mimetypeResolver.getMimeType(name); - - dataNode.setProperty("jcr:mimeType", mimeType); + dataNode.setProperty("jcr:mimeType", "application/octet-stream"); dataNode.setProperty("jcr:lastModified", Calendar.getInstance()); dataNode.setProperty("jcr:data", new ByteArrayInputStream(new byte[]{})); @@ -714,7 +705,7 @@ // create property, prepare the data to be readed String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); testRoot.save(); // read partial @@ -728,8 +719,7 @@ assertEquals("Wrong bytes count have been read", len, res); - compareStream(PrivilegedFileHelper.fileInputStream(testFile), new ByteArrayInputStream(baos.toByteArray()), pos, - 0, len); + compareStream(new FileInputStream(testFile), new ByteArrayInputStream(baos.toByteArray()), pos, 0, len); } public void testReadBigValue() throws Exception @@ -737,7 +727,7 @@ // create property, prepare the data to be readed String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); @@ -779,13 +769,13 @@ // create property, prepare the data to be readed String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); String update1String = "update#1"; - long pos = PrivilegedFileHelper.length(testFile); + long pos = testFile.length(); exv.update(new ByteArrayInputStream(update1String.getBytes()), update1String.length(), pos); @@ -917,7 +907,7 @@ // create property, prepare the data to be readed String pname = "file@" + testFile.getName(); - Property p = testRoot.setProperty(pname, PrivilegedFileHelper.fileInputStream(testFile)); + Property p = testRoot.setProperty(pname, new FileInputStream(testFile)); EditableBinaryValue exv = (EditableBinaryValue)p.getValue(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCConnectionTestBase.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,6 +21,7 @@ import org.exoplatform.services.jcr.datamodel.NodeData; import org.exoplatform.services.jcr.impl.Constants; import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; +import org.exoplatform.services.jcr.impl.storage.jdbc.init.StorageDBInitializer; import java.io.ByteArrayInputStream; import java.sql.Connection; @@ -46,18 +47,18 @@ private Connection connect = null; - @Override protected void tearDown() throws Exception { + connect.close(); super.tearDown(); } public Connection getJNDIConnection() throws Exception { + DataSource ds = (DataSource)new InitialContext().lookup("jdbcjcrtest"); connect = ds.getConnection(); - return connect; } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,12 +25,12 @@ import org.exoplatform.services.jcr.impl.storage.value.cas.RecordNotFoundException; import org.exoplatform.services.jcr.impl.storage.value.cas.ValueContentAddressStorage; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; /** @@ -70,12 +70,12 @@ if (rootDir == null) { rootDir = new File("target/temp/values-test"); - PrivilegedFileHelper.mkdirs(rootDir); + rootDir.mkdirs(); - PrivilegedFileHelper.mkdirs(new File(rootDir, FileValueStorage.TEMP_DIR_NAME)); + new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); - if (!PrivilegedFileHelper.exists(rootDir)) - throw new Exception("Folder does not exist " + PrivilegedFileHelper.getAbsolutePath(rootDir)); + if (!rootDir.exists()) + throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); } if (storageId == null) @@ -110,7 +110,7 @@ FileIOChannel fch = openCASChannel(digestType); String propertyId = IdGenerator.generate(); - ValueData value = new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile)); + ValueData value = new StreamPersistedValueData(0, new FileInputStream(testFile)); fch.write(propertyId, value); fch.commit(); @@ -118,12 +118,10 @@ File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum // =0 - assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper - .exists(vsfile)); + assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); InputStream etalon, tested; - compareStream(etalon = PrivilegedFileHelper.fileInputStream(testFile), tested = - PrivilegedFileHelper.fileInputStream(vsfile)); + compareStream(etalon = new FileInputStream(testFile), tested = new FileInputStream(vsfile)); etalon.close(); tested.close(); } @@ -143,7 +141,7 @@ // prepare String propertyId = IdGenerator.generate(); - ValueData value = new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile)); + ValueData value = new StreamPersistedValueData(0, new FileInputStream(testFile)); fch.write(propertyId, value); fch.commit(); @@ -152,8 +150,7 @@ try { fch = openCASChannel(digestType); - fch.write(new String(propertyId), new StreamPersistedValueData(0, PrivilegedFileHelper - .fileInputStream(testFile))); + fch.write(new String(propertyId), new StreamPersistedValueData(0, new FileInputStream(testFile))); fch.commit(); fail("RecordAlreadyExistsException should be thrown, record exists"); @@ -183,10 +180,10 @@ String propertyId = IdGenerator.generate(); try { - ValueData value = new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile)); + ValueData value = new StreamPersistedValueData(0, new FileInputStream(testFile)); fch.write(propertyId, value); fch.delete(propertyId); - fch.write(propertyId, new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile))); + fch.write(propertyId, new StreamPersistedValueData(0, new FileInputStream(testFile))); fch.commit(); // long initialSize = calcDirSize(rootDir); @@ -210,14 +207,14 @@ FileIOChannel fch = openCASChannel(digestType); String propertyId = IdGenerator.generate(); - ValueData value = new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile)); + ValueData value = new StreamPersistedValueData(0, new FileInputStream(testFile)); fch.write(propertyId, value); fch.commit(); ValueData fvalue = fch.read(propertyId, value.getOrderNumber(), 200 * 1024); InputStream etalon, tested; - compareStream(etalon = PrivilegedFileHelper.fileInputStream(testFile), tested = fvalue.getAsStream()); + compareStream(etalon = new FileInputStream(testFile), tested = fvalue.getAsStream()); etalon.close(); tested.close(); } @@ -233,7 +230,7 @@ FileIOChannel fch = openCASChannel(digestType); String propertyId = IdGenerator.generate(); - ValueData value = new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile)); + ValueData value = new StreamPersistedValueData(0, new FileInputStream(testFile)); fch.write(propertyId, value); fch.commit(); @@ -244,8 +241,7 @@ fch.delete(propertyId); fch.commit(); - assertFalse("File should not exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper - .exists(vsfile)); + assertFalse("File should not exists " + vsfile.getAbsolutePath(), vsfile.exists()); } /** @@ -318,17 +314,16 @@ for (int i = 0; i < 20; i++) { - fch.write(propertyId, new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(testFile))); + fch.write(propertyId, new StreamPersistedValueData(i, new FileInputStream(testFile))); } fch.commit(); File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); - assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper - .exists(vsfile)); + assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); - assertEquals("Storage size must be increased on size of ONE file ", initialSize - + PrivilegedFileHelper.length(testFile), calcDirSize(rootDir)); + assertEquals("Storage size must be increased on size of ONE file ", initialSize + testFile.length(), + calcDirSize(rootDir)); } /** @@ -348,15 +343,14 @@ for (int i = 0; i < 20; i++) { File f = createBLOBTempFile(300); - addedSize += PrivilegedFileHelper.length(f); - fch.write(propertyId, new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f))); + addedSize += f.length(); + fch.write(propertyId, new StreamPersistedValueData(i, new FileInputStream(f))); } fch.commit(); File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); - assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper - .exists(vsfile)); + assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); assertEquals("Storage size must be increased on size of ALL files ", initialSize + addedSize, calcDirSize(rootDir)); @@ -379,12 +373,12 @@ propertyId = IdGenerator.generate(); FileIOChannel fch = openCASChannel(digestType); - fch.write(propertyId, new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile))); + fch.write(propertyId, new StreamPersistedValueData(0, new FileInputStream(testFile))); fch.commit(); } - assertEquals("Storage size must be increased on size of ONE file ", initialSize - + PrivilegedFileHelper.length(testFile), calcDirSize(rootDir)); + assertEquals("Storage size must be increased on size of ONE file ", initialSize + testFile.length(), + calcDirSize(rootDir)); } /** @@ -405,10 +399,10 @@ propertyId = IdGenerator.generate(); File f = createBLOBTempFile(300); - addedSize += PrivilegedFileHelper.length(f); + addedSize += f.length(); FileIOChannel fch = openCASChannel(digestType); - fch.write(propertyId, new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f))); + fch.write(propertyId, new StreamPersistedValueData(i, new FileInputStream(f))); fch.commit(); } @@ -438,7 +432,7 @@ propertyId = pid; FileIOChannel fch = openCASChannel(digestType); - fch.write(pid, new StreamPersistedValueData(0, PrivilegedFileHelper.fileInputStream(testFile))); + fch.write(pid, new StreamPersistedValueData(0, new FileInputStream(testFile))); fch.commit(); } @@ -447,8 +441,8 @@ fch.delete(propertyId); fch.commit(); - assertEquals("Storage size must be unchanged after the delete ", initialSize - + PrivilegedFileHelper.length(testFile), calcDirSize(rootDir)); + assertEquals("Storage size must be unchanged after the delete ", initialSize + testFile.length(), + calcDirSize(rootDir)); } /** @@ -476,10 +470,10 @@ propertyId = pid; File f = createBLOBTempFile(fileSizeKb); - addedSize += (fileSize = PrivilegedFileHelper.length(f)); + addedSize += (fileSize = f.length()); FileIOChannel fch = openCASChannel(digestType); - fch.write(pid, new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f))); + fch.write(pid, new StreamPersistedValueData(i, new FileInputStream(f))); fch.commit(); } @@ -517,9 +511,9 @@ for (int i = 0; i < 5; i++) { File f = createBLOBTempFile(450); - addedSize += (m1fileSize = PrivilegedFileHelper.length(f)); + addedSize += (m1fileSize = f.length()); - StreamPersistedValueData v = new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f)); + StreamPersistedValueData v = new StreamPersistedValueData(i, new FileInputStream(f)); if (i == 1) sharedValue = v; @@ -549,8 +543,8 @@ // new file m2filesCount++; File f = createBLOBTempFile(350); - addedSize += (m2fileSize = PrivilegedFileHelper.length(f)); // add size - v = new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f)); + addedSize += (m2fileSize = f.length()); // add size + v = new StreamPersistedValueData(i, new FileInputStream(f)); } fch.write(property2MultivaluedId, v); } @@ -577,8 +571,8 @@ else { File f = createBLOBTempFile(425); - addedSize += PrivilegedFileHelper.length(f); - v = new StreamPersistedValueData(i, PrivilegedFileHelper.fileInputStream(f)); + addedSize += f.length(); + v = new StreamPersistedValueData(i, new FileInputStream(f)); } FileIOChannel vfch = openCASChannel(digestType); vfch.write(pid, v); @@ -624,28 +618,28 @@ private long deleteRecursive(File dir) { long count = 0; - for (File sf : PrivilegedFileHelper.listFiles(dir)) + for (File sf : dir.listFiles()) { - if (PrivilegedFileHelper.isDirectory(sf) && PrivilegedFileHelper.list(sf).length > 0) + if (sf.isDirectory() && sf.list().length > 0) count += deleteRecursive(sf); - else if (PrivilegedFileHelper.delete(sf)) + else if (sf.delete()) count += 1; else - LOG.warn("Can't delete file " + PrivilegedFileHelper.getAbsolutePath(sf)); + LOG.warn("Can't delete file " + sf.getAbsolutePath()); } - count += PrivilegedFileHelper.delete(dir) ? 1 : 0; + count += dir.delete() ? 1 : 0; return count; } private long calcDirSize(File dir) { long size = 0; - for (File sf : PrivilegedFileHelper.listFiles(dir)) + for (File sf : dir.listFiles()) { - if (PrivilegedFileHelper.isDirectory(sf)) + if (sf.isDirectory()) size += calcDirSize(sf); else - size += PrivilegedFileHelper.length(sf); + size += sf.length(); } return size; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/Probe.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,8 +18,6 @@ */ package org.exoplatform.services.jcr.impl.storage.value.fs; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; - import java.io.File; import java.io.FileInputStream; @@ -47,13 +45,12 @@ this.file = file; } - @Override public void run() { System.out.println("Thread started " + this.getName()); try { - FileInputStream is = PrivilegedFileHelper.fileInputStream(file); + FileInputStream is = new FileInputStream(file); while (is.read() > 0) { len++; 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -24,9 +24,9 @@ import org.exoplatform.services.jcr.impl.dataflow.TesterTransientValueData; 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.FileInputStream; import java.io.FileOutputStream; import java.util.ArrayList; import java.util.List; @@ -58,12 +58,12 @@ super.setUp(); rootDir = new File(new File("target"), "vs1"); - PrivilegedFileHelper.mkdirs(rootDir); + rootDir.mkdirs(); - PrivilegedFileHelper.mkdirs(new File(rootDir, FileValueStorage.TEMP_DIR_NAME)); + new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); - if (!PrivilegedFileHelper.exists(rootDir)) - throw new Exception("Folder does not exist " + PrivilegedFileHelper.getAbsolutePath(rootDir)); + if (!rootDir.exists()) + throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); } @@ -72,19 +72,19 @@ byte[] buf = "0123456789".getBytes(); File file = new File(rootDir, "testReadFromIOChannel0"); - PrivilegedFileHelper.deleteOnExit(file); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + file.deleteOnExit(); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); buf = "01234567890123456789".getBytes(); file = new File(rootDir, "testReadFromIOChannel1"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + out = new FileOutputStream(file); out.write(buf); out.close(); @@ -135,11 +135,11 @@ } channel.commit(); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel0"))); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel1"))); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel2"))); + assertTrue(new File(rootDir, "testWriteToIOChannel0").exists()); + assertTrue(new File(rootDir, "testWriteToIOChannel1").exists()); + assertTrue(new File(rootDir, "testWriteToIOChannel2").exists()); - assertEquals(10, PrivilegedFileHelper.length(new File(rootDir, "testWriteToIOChannel0"))); + assertEquals(10, new File(rootDir, "testWriteToIOChannel0").length()); channel.delete("testWriteToIOChannel"); channel.commit(); @@ -156,16 +156,16 @@ channel.commit(); File f = channel.getFile("testWriteUpdate", 0); - assertTrue(PrivilegedFileHelper.exists(f)); - assertEquals(10, PrivilegedFileHelper.length(f)); + assertTrue(f.exists()); + assertEquals(10, f.length()); byte[] buf1 = "qwerty".getBytes(); channel.write("testWriteUpdate", testerTransientValueData.getTransientValueData(buf1, 0)); channel.commit(); f = channel.getFile("testWriteUpdate", 0); - assertTrue(PrivilegedFileHelper.exists(f)); - assertEquals(6, PrivilegedFileHelper.length(f)); + assertTrue(f.exists()); + assertEquals(6, f.length()); channel.delete("testWriteUpdate"); channel.commit(); @@ -198,16 +198,16 @@ } channel.commit(); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel0"))); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel1"))); - assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel2"))); + assertTrue(new File(rootDir, "testDeleteFromIOChannel0").exists()); + assertTrue(new File(rootDir, "testDeleteFromIOChannel1").exists()); + assertTrue(new File(rootDir, "testDeleteFromIOChannel2").exists()); channel.delete("testDeleteFromIOChannel"); channel.commit(); - assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel0"))); - assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel1"))); - assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel2"))); + assertFalse(new File(rootDir, "testDeleteFromIOChannel0").exists()); + assertFalse(new File(rootDir, "testDeleteFromIOChannel1").exists()); + assertFalse(new File(rootDir, "testDeleteFromIOChannel2").exists()); channel.delete("testDeleteFromIOChannel"); channel.commit(); @@ -237,8 +237,8 @@ channel.commit(); File f = new File(rootDir, "testConcurrentReadFromIOChannel0"); - if (!PrivilegedFileHelper.exists(f)) - throw new Exception("File does not exist " + PrivilegedFileHelper.getAbsolutePath(f)); + if (!f.exists()) + throw new Exception("File does not exist " + f.getAbsolutePath()); Probe[] p = new Probe[10]; for (int i = 0; i < 10; i++) @@ -296,8 +296,8 @@ f = new File(rootDir, "testDeleteLockedFileFromIOChannel0"); // assertFalse(f.exists()); - System.out.println(">>>>>>>>>>>>>" + f.canRead() + " " + PrivilegedFileHelper.exists(f) + " " + f.canWrite()); - System.out.println(">>>>>>>>>>>>>" + PrivilegedFileHelper.fileInputStream(f).read()); + System.out.println(">>>>>>>>>>>>>" + f.canRead() + " " + f.exists() + " " + f.canWrite()); + System.out.println(">>>>>>>>>>>>>" + new FileInputStream(f).read()); // new Probe(f).start(); } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.impl.dataflow.persistent.ByteArrayPersistedValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.FilePersistedValueData; import org.exoplatform.services.jcr.impl.storage.value.ValueDataResourceHolder; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.File; @@ -86,9 +85,9 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadByteArrayValueData"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); @@ -108,9 +107,9 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadFileValueData"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); @@ -137,8 +136,8 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testWriteFileValueData"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); + if (file.exists()) + file.delete(); 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/TestRemoveFromValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestRemoveFromValueStorage.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -22,7 +22,6 @@ import org.exoplatform.services.jcr.datamodel.PropertyData; import org.exoplatform.services.jcr.impl.core.PropertyImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.storage.value.ValueIOChannel; import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; @@ -99,7 +98,7 @@ generator.nextBytes(smallValue); values[i] = testRoot.getSession().getValueFactory().createValue(new ByteArrayInputStream(smallValue)); } - + if (values.length == 1) { prop = testRoot.setProperty("binaryProperty", values[0]); @@ -155,7 +154,7 @@ // TreeFileIOChannel always returns a File. But if this file doesn't // really exists is size is 0. File value = channels.get(i).getFile(propertyId, i); - if (PrivilegedFileHelper.length(value) == 0) + if (value.length() == 0) { throw new Exception(""); } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -23,7 +23,6 @@ import org.exoplatform.services.jcr.dataflow.serialization.ObjectWriter; import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectReaderImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectWriterImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.BufferedInputStream; import java.io.File; @@ -86,25 +85,24 @@ private boolean outFile; - @Override public void setUp() throws Exception { super.setUp(); io = new ValueFileIOHelper(); - if (src == null || !PrivilegedFileHelper.exists(src)) + if (src == null || !src.exists()) { src = createBLOBTempFile(7 * 1024); // 7M - PrivilegedFileHelper.deleteOnExit(src); + src.deleteOnExit(); } - if (srcSerialization == null || !PrivilegedFileHelper.exists(srcSerialization)) + if (srcSerialization == null || !srcSerialization.exists()) { - srcSerialization = PrivilegedFileHelper.createTempFile("srcSerialization", ".tmp"); - PrivilegedFileHelper.deleteOnExit(srcSerialization); + srcSerialization = File.createTempFile("srcSerialization", ".tmp"); + srcSerialization.deleteOnExit(); - OutputStream out = PrivilegedFileHelper.fileOutputStream(srcSerialization); + OutputStream out = new FileOutputStream(srcSerialization); ObjectWriter ow = new ObjectWriterImpl(out); for (int i = 0; i < BLOCK_COUNT; i++) { @@ -124,15 +122,14 @@ } testDir = new File("target/TestValueFileIOHelper"); - PrivilegedFileHelper.mkdirs(testDir); + testDir.mkdirs(); - dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); + dest = File.createTempFile("vdftest", "", testDir); } - @Override public void tearDown() throws Exception { - PrivilegedFileHelper.delete(dest); + dest.delete(); super.tearDown(); } @@ -140,13 +137,13 @@ public void testCopySerialization() throws Exception { - System.out.println("=== test Serialization, file size: " + PrivilegedFileHelper.length(srcSerialization)); + System.out.println("=== test Serialization, file size: " + srcSerialization.length()); // copy via InputStream long start = System.currentTimeMillis(); - InputStream in = PrivilegedFileHelper.fileInputStream(srcSerialization); - OutputStream out = PrivilegedFileHelper.fileOutputStream(dest); + InputStream in = new FileInputStream(srcSerialization); + OutputStream out = new FileOutputStream(dest); ObjectReader or = new ObjectReaderImpl(in); ObjectWriter ow = new ObjectWriterImpl(out); @@ -173,14 +170,14 @@ System.out.println("\t=== IO time " + (System.currentTimeMillis() - start)); // clean and recreate file - PrivilegedFileHelper.delete(dest); - dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); + dest.delete(); + dest = File.createTempFile("vdftest", "", testDir); // copy via NIO start = System.currentTimeMillis(); - in = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(srcSerialization)); - out = PrivilegedFileHelper.fileOutputStream(dest); + in = new BufferedInputStream(new FileInputStream(srcSerialization)); + out = new FileOutputStream(dest); openChannel(in, out); long pos = 0; @@ -204,20 +201,20 @@ + (System.currentTimeMillis() - start)); // check length - assertEquals(PrivilegedFileHelper.length(srcSerialization), PrivilegedFileHelper.length(dest)); + assertEquals(srcSerialization.length(), dest.length()); } public void testCopyFileToFile() throws Exception { - io.copyClose(PrivilegedFileHelper.fileInputStream(src), PrivilegedFileHelper.fileOutputStream(dest)); + io.copyClose(new FileInputStream(src), new FileOutputStream(dest)); // check length - assertEquals(PrivilegedFileHelper.length(src), PrivilegedFileHelper.length(dest)); + assertEquals(src.length(), dest.length()); // check content - // InputStream srcin = PrivilegedFileHelper.fileInputStream(src); - // InputStream destin = PrivilegedFileHelper.fileInputStream(dest); + // InputStream srcin = new FileInputStream(src); + // InputStream destin = new FileInputStream(dest); // try { // compareStream(srcin, destin); // } finally { @@ -229,14 +226,14 @@ public void testCopyBytesToFile() throws Exception { - System.out.println("=== test copyBytesToFile, file size: " + PrivilegedFileHelper.length(src)); + System.out.println("=== test copyBytesToFile, file size: " + src.length()); // copy via InputStream long start = System.currentTimeMillis(); - InputStream in = PrivilegedFileHelper.fileInputStream(src); + InputStream in = new FileInputStream(src); // InputStream in = new URL("http://jboss1.exoua-int:8089/browser/02.zip").openStream(); - OutputStream out = PrivilegedFileHelper.fileOutputStream(dest); + OutputStream out = new FileOutputStream(dest); try { int r = 0; @@ -256,23 +253,22 @@ System.out.println("\t=== IO time " + (System.currentTimeMillis() - start)); // clean and recreate file - PrivilegedFileHelper.delete(dest); - dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); + dest.delete(); + dest = File.createTempFile("vdftest", "", testDir); // copy via NIO start = System.currentTimeMillis(); - io.copyClose(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(src)), PrivilegedFileHelper - .fileOutputStream(dest)); + io.copyClose(new BufferedInputStream(new FileInputStream(src)), new FileOutputStream(dest)); // io.copyClose(new URL("http://jboss1.exoua-int:8089/browser/02.zip").openStream(), new // FileOutputStream(dest)); System.out.println("\t=== NIO time " + (System.currentTimeMillis() - start)); // check length - assertEquals(PrivilegedFileHelper.length(src), PrivilegedFileHelper.length(dest)); + assertEquals(src.length(), dest.length()); // check content - // InputStream srcin = PrivilegedFileHelper.fileInputStream(src); - // InputStream destin = PrivilegedFileHelper.fileInputStream(dest); + // InputStream srcin = new FileInputStream(src); + // InputStream destin = new FileInputStream(dest); // try { // compareStream(srcin, destin); // } finally { 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.impl.tools.tree.generator; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -26,6 +25,7 @@ import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -93,14 +93,14 @@ else { file = createBLOBTempFile(size); - inputStream = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(file)); + inputStream = new BufferedInputStream(new FileInputStream(file)); } val = valueFactory.createValue(inputStream); val.getStream();// to spool data; inputStream.close(); if (file != null) - PrivilegedFileHelper.delete(file); + file.delete(); break; case PropertyType.BOOLEAN : val = valueFactory.createValue(random.nextBoolean()); @@ -175,8 +175,8 @@ // create test file byte[] data = new byte[1024]; // 1Kb - File testFile = PrivilegedFileHelper.createTempFile("randomsizefile", ".tmp"); - FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + File testFile = File.createTempFile("randomsizefile", ".tmp"); + FileOutputStream tempOut = new FileOutputStream(testFile); for (int i = 0; i < sizeInb; i += 1024) { @@ -191,9 +191,8 @@ tempOut.write(data); } tempOut.close(); - PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " - + PrivilegedFileHelper.length(testFile)); + testFile.deleteOnExit(); // delete on test exit + log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + testFile.length()); return testFile; } 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.impl.dataflow.persistent.FilePersistedValueData; import org.exoplatform.services.jcr.impl.storage.value.fs.Probe; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.impl.util.io.SwapFile; import java.io.ByteArrayInputStream; @@ -59,9 +58,9 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamValueData"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); @@ -85,15 +84,15 @@ byte[] buf = "0123456789".getBytes(); SwapFile file = SwapFile.get(new File("target"), "testIfFinalizeRemovesTempFileStreamValueData"); - //File file = PrivilegedFileHelper.file("target/testIfFinalizeRemovesTempFileStreamValueData"); + //File file = new File("target/testIfFinalizeRemovesTempFileStreamValueData"); //if (file.exists()) // file.delete(); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); CleanableFilePersistedValueData vd = new CleanableFilePersistedValueData(0, file, new FileCleaner(1000, true)); - assertTrue(PrivilegedFileHelper.exists(file)); + assertTrue(file.exists()); vd = null; System.gc(); @@ -102,7 +101,7 @@ Thread.sleep(2500); System.gc(); - assertFalse(PrivilegedFileHelper.exists(file)); + assertFalse(file.exists()); } public void testConcurrentFileStreamValueDataReading() throws Exception @@ -112,9 +111,9 @@ "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" .getBytes(); File file = new File("target/testConcurrentFileStreamValueDataReading"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -26,7 +26,6 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.util.JCRDateFormat; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.ByteArrayInputStream; import java.io.File; @@ -70,15 +69,14 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamTransientValueData"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); - FileInputStream fs1 = PrivilegedFileHelper.fileInputStream(file); - TransientValueData vd = - new TransientValueData(0, null, fs1, null, new FileCleaner(), 5, new File("target"), true); + FileInputStream fs1 = new FileInputStream(file); + TransientValueData vd = new TransientValueData(0, null, fs1, null, new FileCleaner(), 5, new File("target"), true); // spool to file InputStream fs2 = vd.getAsStream(); @@ -120,7 +118,7 @@ // TODO not influenced here as will be spooled to byte array anyway //vd.setMaxBufferSize(5); //vd.setFileCleaner(new FileCleaner()); - + // InputStream fs2 = vd.getAsStream(); assertEquals(10, vd.getLength()); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -29,9 +29,10 @@ import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectWriterImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.TransactionChangesLogWriter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.FilenameFilter; import java.util.ArrayList; import java.util.List; @@ -81,7 +82,6 @@ /** * {@inheritDoc} */ - @Override public void tearDown() throws Exception { super.tearDown(); @@ -99,7 +99,7 @@ System.gc(); Thread.sleep(2000); - String[] countBefore = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() + String[] countBefore = tmpdir.list(new FilenameFilter() { public boolean accept(File dir, String name) { @@ -108,13 +108,13 @@ }); NodeImpl node = (NodeImpl)root.addNode("testNode"); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile)); + node.setProperty("testProp", new FileInputStream(tmpFile)); root.save(); System.gc(); Thread.sleep(2000); - String[] countAfter = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() + String[] countAfter = tmpdir.list(new FilenameFilter() { public boolean accept(File dir, String name) { @@ -138,7 +138,7 @@ System.gc(); Thread.sleep(2000); - String[] countBefore = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() + String[] countBefore = tmpdir.list(new FilenameFilter() { public boolean accept(File dir, String name) { @@ -147,14 +147,14 @@ }); Node node = root.addNode("testNode"); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile)); + node.setProperty("testProp", new FileInputStream(tmpFile)); node.getProperty("testProp").getStream().close(); root.save(); System.gc(); Thread.sleep(2000); - String[] countAfter = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() + String[] countAfter = tmpdir.list(new FilenameFilter() { public boolean accept(File dir, String name) { @@ -170,7 +170,7 @@ File tmpFile = createBLOBTempFile(250); Node node = root.addNode("testNode"); - node.setProperty("testProp", PrivilegedFileHelper.fileInputStream(tmpFile)); + node.setProperty("testProp", new FileInputStream(tmpFile)); session.save(); TransactionChangesLog cl = new TransactionChangesLog(cLog.getLogIterator().nextLog()); @@ -178,8 +178,7 @@ node.getProperty("testProp").remove(); session.save(); - ObjectWriter out = - new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(File.createTempFile("out", ".tmp"))); + ObjectWriter out = new ObjectWriterImpl(new FileOutputStream(File.createTempFile("out", ".tmp"))); TransactionChangesLogWriter lw = new TransactionChangesLogWriter(); lw.write(out, cl); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -28,7 +28,6 @@ import org.exoplatform.services.jcr.impl.core.value.StringValue; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; 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.FileInputStream; @@ -54,13 +53,13 @@ byte[] buf = "012345678901234567890123456789".getBytes(); File file = new File("target/testNewBinaryValue"); - if (PrivilegedFileHelper.exists(file)) - PrivilegedFileHelper.delete(file); - FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); + if (file.exists()) + file.delete(); + FileOutputStream out = new FileOutputStream(file); out.write(buf); out.close(); - FileInputStream fs1 = PrivilegedFileHelper.fileInputStream(file); + FileInputStream fs1 = new FileInputStream(file); BinaryValue val = new BinaryValue(fs1, new FileCleaner(), tempDirectory, maxFufferSize); InputStream str1 = val.getStream(); assertNotNull(str1); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/cluster/test/TestBLOBValue.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -1,7 +1,6 @@ package org.exoplatform.services.jcr.lab.cluster.test; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.FileInputStream; @@ -32,7 +31,7 @@ Node contentNode = file.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); contentNode.setProperty("jcr:mimeType", "application/octet-stream"); - InputStream is = PrivilegedFileHelper.fileInputStream(blob); + InputStream is = new FileInputStream(blob); try { contentNode.setProperty("jcr:data", is); @@ -82,7 +81,7 @@ { children.nextNode().remove(); } - + testRoot.save(); } @@ -97,7 +96,7 @@ // write Property text = testRoot.setProperty("text", "string property"); - FileInputStream fis = PrivilegedFileHelper.fileInputStream(testFile); + FileInputStream fis = new FileInputStream(testFile); Property blob = testRoot.setProperty("blob", fis); testRoot.save(); @@ -117,7 +116,7 @@ size += r; } - assertEquals(PrivilegedFileHelper.length(testFile), size); + assertEquals(testFile.length(), size); } // for read on another node of a cluster @@ -135,7 +134,7 @@ size += r; } - assertEquals(PrivilegedFileHelper.length(testFile), size); + assertEquals(testFile.length(), size); } public void testAddNTFiles() throws Exception @@ -183,3 +182,4 @@ } } } + Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/java/TestFileLock.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/java/TestFileLock.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/java/TestFileLock.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,8 +20,6 @@ import junit.framework.TestCase; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -47,7 +45,7 @@ File f = new File("\\\\storm\\public\\file1.tmp"); f.createNewFile(); - FileOutputStream fout = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fout = new FileOutputStream(f); FileChannel fc = fout.getChannel(); ByteBuffer buff = ByteBuffer.wrap("test-file1".getBytes()); @@ -56,7 +54,7 @@ fc.close(); // reopen - FileInputStream fin = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fin = new FileInputStream(f); fc = fin.getChannel(); byte[] b = new byte[256]; @@ -67,7 +65,7 @@ System.out.println(new String(b, 0, res)); // lock file - fout = PrivilegedFileHelper.fileOutputStream(f); + fout = new FileOutputStream(f); fc = fout.getChannel(); FileLock lock = fc.lock(); @@ -76,13 +74,12 @@ // check another lock Thread another = new Thread() { - @Override public void run() { try { Thread.sleep(25); - FileOutputStream fout1 = PrivilegedFileHelper.fileOutputStream(new File("\\\\storm\\public\\file1.tmp")); + FileOutputStream fout1 = new FileOutputStream(new File("\\\\storm\\public\\file1.tmp")); FileChannel fc1 = fout1.getChannel(); try { @@ -112,7 +109,7 @@ fc.close(); // print final content - fin = PrivilegedFileHelper.fileInputStream(f); + fin = new FileInputStream(f); fc = fin.getChannel(); res = -1; @@ -134,11 +131,11 @@ final long timeout = Long.valueOf(System.getProperty("exo.jcr.lab.testFileLockTimeout", "20000")); - // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file2.tmp"); + // File f = new File("\\\\storm\\public\\file2.tmp"); File f = new File("D:\\tmp\\file2.tmp"); System.out.println("Try open file for write " + System.currentTimeMillis()); - FileOutputStream fout = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fout = new FileOutputStream(f); FileChannel fc = fout.getChannel(); System.out.println("Try lock file " + System.currentTimeMillis()); FileLock lock = fc.lock(); @@ -157,7 +154,7 @@ // reopen for read Thread.sleep(timeout); System.out.println("Try read file " + System.currentTimeMillis()); - FileInputStream fin = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fin = new FileInputStream(f); fc = fin.getChannel(); System.out.println("Try shared lock " + System.currentTimeMillis()); FileLock shlock = fc.lock(0, fc.size(), true); @@ -175,7 +172,7 @@ // lock file for write Thread.sleep(timeout); System.out.println("Try open file for write " + System.currentTimeMillis()); - fout = PrivilegedFileHelper.fileOutputStream(f); + fout = new FileOutputStream(f); fc = fout.getChannel(); System.out.println("Try lock file " + System.currentTimeMillis()); lock = fc.lock(); @@ -196,7 +193,7 @@ // print final content Thread.sleep(timeout); System.out.println("Try read file " + System.currentTimeMillis()); - fin = PrivilegedFileHelper.fileInputStream(f); + fin = new FileInputStream(f); fc = fin.getChannel(); System.out.println("Try shared lock " + System.currentTimeMillis()); shlock = fc.lock(0, fc.size(), true); @@ -217,12 +214,12 @@ final long timeout = Long.valueOf(System.getProperty("exo.jcr.lab.testFileLockTimeout", "20000")); - // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file3.tmp"); + // File f = new File("\\\\storm\\public\\file3.tmp"); File f = new File("D:\\tmp\\file3.tmp"); // write new content System.out.println("Try open file for write " + System.currentTimeMillis()); - FileOutputStream fout = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fout = new FileOutputStream(f); FileChannel fc = fout.getChannel(); System.out.println("Try lock file " + System.currentTimeMillis()); FileLock lock = fc.lock(); @@ -238,7 +235,7 @@ // reopen for read Thread.sleep(timeout); System.out.println("Try read file " + System.currentTimeMillis()); - FileInputStream fin = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fin = new FileInputStream(f); fc = fin.getChannel(); System.out.println("Try shared lock " + System.currentTimeMillis()); FileLock shlock = fc.lock(0, fc.size(), true); @@ -262,12 +259,12 @@ public void testInputStreamLock() throws IOException, InterruptedException { - // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file3.tmp"); + // File f = new File("\\\\storm\\public\\file3.tmp"); File f = new File("D:\\tmp\\file4.tmp"); // write new content System.out.println("Try open file for read " + System.currentTimeMillis()); - FileInputStream fin = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fin = new FileInputStream(f); FileChannel fc = fin.getChannel(); System.out.println("Try lock file " + System.currentTimeMillis()); fin.read(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValue.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValue.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,8 +19,8 @@ package org.exoplatform.services.jcr.load.blob; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import java.io.FileInputStream; import java.io.InputStream; import java.util.Calendar; @@ -69,7 +69,6 @@ // -------------- TEST FILE ------------------ private static String TEST_FILE = null; // URL_SMALL_FILE - @Override public void setUp() throws Exception { super.setUp();// .repository @@ -79,7 +78,7 @@ if (TEST_FILE == null) { // create test file - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(2)); + TEST_FILE = createBLOBTempFile(2).getAbsolutePath(); } } @@ -90,14 +89,14 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); + TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); for (int i = 0; i < FILES_COUNT; i++) { Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -134,14 +133,14 @@ * "application/octet-stream "); contentNode.setProperty("jcr:lastModified", * Calendar.getInstance()); } session.save(); endTime = System.currentTimeMillis(); * log.info("Execution time after adding and saving: (local small)" + ((endTime - startTime) / - * 1000) + "s"); // check streams //compareStream(PrivilegedFileHelper.fileInputStream(LOCAL_SMALL_FILE), // + * 1000) + "s"); // check streams //compareStream(new FileInputStream(LOCAL_SMALL_FILE), // * testLocalSmallFiles.getProperty("smallFile0/jcr:content/jcr:data").getStream()); } public void * testRemoteBigFiles() throws Exception { Node testRemoteBigFiles = * testBinaryValue.addNode("testRemoteBigFiles"); long startTime, endTime; startTime = * System.currentTimeMillis(); // to get the time of start for (int i = 0; i < FILES_COUNT; i++) { * Node remoteBigFile = testRemoteBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = * remoteBigFile.addNode("jcr:content", "nt:resource"); //contentNode.setProperty("jcr:encoding", - * "UTF-8"); contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(REMOTE_BIG_FILE)); + * "UTF-8"); contentNode.setProperty("jcr:data", new FileInputStream(REMOTE_BIG_FILE)); * contentNode.setProperty("jcr:mimeType", "application/octet-stream "); * contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); } session.save(); endTime * = System.currentTimeMillis(); log.info("Execution time after adding and saving (remote big):" + @@ -158,7 +157,7 @@ * "application/octet-stream "); contentNode.setProperty("jcr:lastModified", * Calendar.getInstance()); } session.save(); endTime = System.currentTimeMillis(); * log.info("Execution time after adding and saving: (remote small)" + ((endTime - startTime) / - * 1000) + "s"); // check streams compareStream(PrivilegedFileHelper.fileInputStream(LOCAL_SMALL_FILE), + * 1000) + "s"); // check streams compareStream(new FileInputStream(LOCAL_SMALL_FILE), * testRemoteSmallFiles.getProperty("smallFile0/jcr:content/jcr:data").getStream()); } public void * testUrlBigFiles() throws Exception { Node testUrlBigFiles = * testBinaryValue.addNode("testUrlBigFiles"); long startTime, endTime; startTime = @@ -182,7 +181,6 @@ * + "s"); } */ - @Override protected void tearDown() throws Exception { testBinaryValue.remove(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValueMultiThreading.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValueMultiThreading.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValueMultiThreading.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,8 +21,8 @@ import org.exoplatform.services.jcr.JcrAPIBaseTest; import org.exoplatform.services.jcr.core.CredentialsImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import java.io.FileInputStream; import java.util.ArrayList; import java.util.Calendar; @@ -71,7 +71,6 @@ protected class TestJCRClient extends Thread { - @Override public void run() { log.info("Client started..."); @@ -93,13 +92,13 @@ { // check streams - compareStream(PrivilegedFileHelper.fileInputStream(LOCAL_SMALL_FILE), testLocalSmallFiles.getProperty( + compareStream(new FileInputStream(LOCAL_SMALL_FILE), testLocalSmallFiles.getProperty( "smallFile" + i + "/jcr:content/jcr:data").getStream()); - compareStream(PrivilegedFileHelper.fileInputStream(LOCAL_BIG_FILE), testLocalBigFiles.getProperty( + compareStream(new FileInputStream(LOCAL_BIG_FILE), testLocalBigFiles.getProperty( "bigFile" + i + "/jcr:content/jcr:data").getStream()); /* - * compareStream(PrivilegedFileHelper.fileInputStream(REMOTE_SMALL_FILE), + * compareStream(new FileInputStream(REMOTE_SMALL_FILE), * testRemoteSmallFiles.getProperty("smallFile" + i + * "/jcr:content/jcr:data").getStream()); compareStream(new * FileInputStream(REMOTE_BIG_FILE), testRemoteBigFiles.getProperty("bigFile" + i + @@ -130,7 +129,7 @@ { Node localSmallFile = testLocalSmallFiles.addNode("smallFile" + i, "nt:file"); Node contentNode = localSmallFile.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(LOCAL_SMALL_FILE)); + contentNode.setProperty("jcr:data", new FileInputStream(LOCAL_SMALL_FILE)); contentNode.setProperty("jcr:mimeType", "application/octet-stream"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); } @@ -139,14 +138,14 @@ if (LOCAL_BIG_FILE == null) { // create test file - LOCAL_BIG_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(3)); + LOCAL_BIG_FILE = createBLOBTempFile(3).getAbsolutePath(); } Node testLocalBigFiles = root.addNode("testLocalBigFiles"); for (int i = 0; i < FILES_COUNT; i++) { Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(LOCAL_BIG_FILE)); + contentNode.setProperty("jcr:data", new FileInputStream(LOCAL_BIG_FILE)); contentNode.setProperty("jcr:mimeType", "application/octet-stream"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); } @@ -156,13 +155,13 @@ * Node testRemoteSmallFiles = root.addNode("testRemoteSmallFiles"); for (int i = 0; i < * FILES_COUNT; i++) { Node remoteSmallFile = testRemoteSmallFiles.addNode("smallFile" + i, * "nt:file"); Node contentNode = remoteSmallFile.addNode("jcr:content", "nt:resource"); - * contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(REMOTE_SMALL_FILE)); + * contentNode.setProperty("jcr:data", new FileInputStream(REMOTE_SMALL_FILE)); * contentNode.setProperty("jcr:mimeType", "application/octet-stream "); * contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); } //Remote big files * Node testRemoteBigFiles = root.addNode("testRemoteBigFiles"); for (int i = 0; i < * FILES_COUNT; i++) { Node remoteBigFile = testRemoteBigFiles.addNode("bigFile" + i, * "nt:file"); Node contentNode = remoteBigFile.addNode("jcr:content", "nt:resource"); - * contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(REMOTE_BIG_FILE)); + * contentNode.setProperty("jcr:data", new FileInputStream(REMOTE_BIG_FILE)); * contentNode.setProperty("jcr:mimeType", "application/octet-stream "); * contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); } //Url small files Node * testUrlSmallFiles = root.addNode("testUrlSmallFiles"); for (int i = 0; i < FILES_COUNT; i++) 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,7 +20,6 @@ import org.exoplatform.services.jcr.JcrAPIBaseTest; import org.exoplatform.services.jcr.impl.core.PropertyImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.load.blob.thread.CreateThread; import org.exoplatform.services.jcr.load.blob.thread.DeleteThread; import org.exoplatform.services.jcr.load.blob.thread.NtFileCreatorThread; @@ -28,6 +27,7 @@ import org.exoplatform.services.jcr.util.IdGenerator; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -74,7 +74,6 @@ private File testFile = null; - @Override public void setUp() throws Exception { super.setUp(); @@ -87,8 +86,8 @@ { // create test file testFile = createBLOBTempFile(1024); - dataSize = (int)PrivilegedFileHelper.length(testFile); - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(testFile); + dataSize = (int)testFile.length(); + TEST_FILE = testFile.getAbsolutePath(); } else { @@ -96,7 +95,7 @@ byte[] buff = new byte[1024 * 4]; int read = 0; // InputStream dataStream = new URL(TEST_FILE).openStream(); - InputStream dataStream = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream dataStream = new FileInputStream(TEST_FILE); while ((read = dataStream.read(buff)) >= 0) { dataSize += read; @@ -113,7 +112,7 @@ try { if (testFile != null) - PrivilegedFileHelper.delete(testFile); + testFile.delete(); } catch (Throwable e) { @@ -141,7 +140,7 @@ Node testRoot = csession.getRootNode().getNode(TestConcurrentItems.TEST_ROOT); Node ntFile = testRoot.addNode(nodeName, "nt:file"); Node contentNode = ntFile.addNode("jcr:content", "nt:resource"); - dataStream = PrivilegedFileHelper.fileInputStream(TestConcurrentItems.TEST_FILE); + dataStream = new FileInputStream(TestConcurrentItems.TEST_FILE); PropertyImpl data = (PropertyImpl)contentNode.setProperty("jcr:data", dataStream); contentNode.setProperty("jcr:mimeType", "video/avi"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); @@ -249,14 +248,12 @@ for (int i = 0; i < 5; i++) { ReadThread readed = - new ReadThread( - repository - .login( - this.credentials /* - * session.getCredentials( - * ) - */, - "ws1")); + new ReadThread(repository.login( + this.credentials /* + * session.getCredentials( + * ) + */, + "ws1")); readed.start(); readers.add(readed); try @@ -270,15 +267,10 @@ } log.info("Begin cleaner..."); - DeleteThread cleaner = - new DeleteThread( - repository - .login( - this.credentials /* - * session.getCredentials - * () - */, - "ws1")); + DeleteThread cleaner = new DeleteThread(repository.login(this.credentials /* + * session.getCredentials + * () + */, "ws1")); cleaner.start(); log.info("<<<<<<<<<<<<<<<<<<<< Wait cycle >>>>>>>>>>>>>>>>>>>>>"); @@ -419,7 +411,6 @@ Thread waiter = new Thread() { - @Override public void run() { try @@ -457,7 +448,7 @@ Node testRoot = csession.getRootNode().getNode(TestConcurrentItems.TEST_ROOT); Node ntFile = testRoot.addNode(nodeName, "nt:file"); Node contentNode = ntFile.addNode("jcr:content", "nt:resource"); - dataStream = PrivilegedFileHelper.fileInputStream(TEST_FILE); + dataStream = new FileInputStream(TEST_FILE); PropertyImpl data = (PropertyImpl)contentNode.setProperty("jcr:data", dataStream); contentNode.setProperty("jcr:mimeType", "video/avi"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,11 +19,11 @@ package org.exoplatform.services.jcr.load.blob; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -48,7 +48,7 @@ */ public void testBigExportSysView() throws Exception { - String TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(1024 * 5));// 5M + String TEST_FILE = createBLOBTempFile(1024 * 5).getAbsolutePath();// 5M Node testLocalBigFiles = root.addNode("testLocalBigFiles"); // add file to repository @@ -57,7 +57,7 @@ Node localBigFile = testLocalBigFiles.addNode("bigFile" + 1, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -71,19 +71,19 @@ log.info("Execution time after adding and saving (local big):" + ((endTime - startTime) / 1000) + "s"); // Exporting repository content - File file = PrivilegedFileHelper.createTempFile("tesSysExport", ".xml"); + File file = File.createTempFile("tesSysExport", ".xml"); - BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(file)); + BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file)); session.exportSystemView(testLocalBigFiles.getPath(), bufferedOutputStream, false, false); bufferedOutputStream.flush(); bufferedOutputStream.close(); - assertTrue(PrivilegedFileHelper.length(file) > 0); + assertTrue(file.length() > 0); // removing source node testLocalBigFiles.remove(); session.save(); - BufferedInputStream bufferedInputStream = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(file)); + BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); // importing content session.importXML(root.getPath(), bufferedInputStream, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); @@ -95,13 +95,13 @@ Node content = lbf.getNode("jcr:content"); // comparing with source file - compareStream(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(TEST_FILE)), content.getProperty( - "jcr:data").getStream()); + compareStream(new BufferedInputStream(new FileInputStream(TEST_FILE)), content.getProperty("jcr:data") + .getStream()); n1.remove(); session.save(); - PrivilegedFileHelper.deleteOnExit(file); - PrivilegedFileHelper.delete(file); + file.deleteOnExit(); + file.delete(); } @@ -112,7 +112,7 @@ */ public void testBigImportExportDocView() throws Exception { - String TEST_FILE2 = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(1024 * 5)); // 5M + String TEST_FILE2 = createBLOBTempFile(1024 * 5).getAbsolutePath(); // 5M Node testLocalBigFiles = root.addNode("testDocView"); // add file to repository @@ -121,7 +121,7 @@ Node localBigFile = testLocalBigFiles.addNode("bigFile" + 1, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE2); + InputStream is = new FileInputStream(TEST_FILE2); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -135,19 +135,19 @@ log.info("Execution time after adding and saving (local big):" + ((endTime - startTime) / 1000) + "s"); // Exporting repository content - File file = PrivilegedFileHelper.createTempFile("tesDocExport", ".xml"); + File file = File.createTempFile("tesDocExport", ".xml"); - BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(file)); + BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file)); session.exportDocumentView(testLocalBigFiles.getPath(), bufferedOutputStream, false, false); bufferedOutputStream.flush(); bufferedOutputStream.close(); - assertTrue(PrivilegedFileHelper.length(file) > 0); + assertTrue(file.length() > 0); // removing source node testLocalBigFiles.remove(); session.save(); - BufferedInputStream bufferedInputStream = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(file)); + BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); // importing content session.importXML(root.getPath(), bufferedInputStream, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); @@ -159,13 +159,13 @@ Node content = lbf.getNode("jcr:content"); // comparing with source file - compareStream(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(TEST_FILE2)), content.getProperty( - "jcr:data").getStream()); + compareStream(new BufferedInputStream(new FileInputStream(TEST_FILE2)), content.getProperty("jcr:data") + .getStream()); n1.remove(); session.save(); - PrivilegedFileHelper.deleteOnExit(file); - PrivilegedFileHelper.delete(file); + file.deleteOnExit(); + file.delete(); } public void testIEPdfFiles() throws Exception @@ -181,7 +181,7 @@ Node localBigFile = testLocalBigFiles.addNode("bigFile" + 1, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -195,19 +195,19 @@ log.info("Execution time after adding and saving (local big):" + ((endTime - startTime) / 1000) + "s"); // Exporting repository content - File file = PrivilegedFileHelper.createTempFile("tesSysExport", ".xml"); + File file = File.createTempFile("tesSysExport", ".xml"); - BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(file)); + BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file)); session.exportSystemView(testLocalBigFiles.getPath(), bufferedOutputStream, false, false); bufferedOutputStream.flush(); bufferedOutputStream.close(); - assertTrue(PrivilegedFileHelper.length(file) > 0); + assertTrue(file.length() > 0); // removing source node testLocalBigFiles.remove(); session.save(); - BufferedInputStream bufferedInputStream = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(file)); + BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); // importing content session.importXML(root.getPath(), bufferedInputStream, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); @@ -219,13 +219,13 @@ Node content = lbf.getNode("jcr:content"); // comparing with source file - compareStream(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(TEST_FILE)), content.getProperty( - "jcr:data").getStream()); + compareStream(new BufferedInputStream(new FileInputStream(TEST_FILE)), content.getProperty("jcr:data") + .getStream()); n1.remove(); session.save(); - PrivilegedFileHelper.deleteOnExit(file); - PrivilegedFileHelper.delete(file); + file.deleteOnExit(); + file.delete(); } public void testRandomSizeExportImportSysView() throws Exception @@ -237,7 +237,7 @@ for (int i = 0; i < FILES_COUNT; i++) { - fileList.add(PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(random.nextInt(1024 * 1024)))); + fileList.add(createBLOBTempFile(random.nextInt(1024 * 1024)).getAbsolutePath()); } Node testLocalBigFiles = root.addNode("testLocalBigFiles"); @@ -250,7 +250,7 @@ Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -265,19 +265,19 @@ } // Exporting repository content - File file = PrivilegedFileHelper.createTempFile("tesSysExport", ".xml"); + File file = File.createTempFile("tesSysExport", ".xml"); - BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(file)); + BufferedOutputStream bufferedOutputStream = new BufferedOutputStream(new FileOutputStream(file)); session.exportSystemView(testLocalBigFiles.getPath(), bufferedOutputStream, false, false); bufferedOutputStream.flush(); bufferedOutputStream.close(); - assertTrue(PrivilegedFileHelper.length(file) > 0); + assertTrue(file.length() > 0); // removing source node testLocalBigFiles.remove(); session.save(); - BufferedInputStream bufferedInputStream = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(file)); + BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); // importing content session.importXML(root.getPath(), bufferedInputStream, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING); @@ -291,24 +291,23 @@ Node lbf = n1.getNode("bigFile" + i); Node content = lbf.getNode("jcr:content"); // comparing with source file - compareStream(new BufferedInputStream(PrivilegedFileHelper.fileInputStream(TEST_FILE)), content.getProperty( - "jcr:data").getStream()); + compareStream(new BufferedInputStream(new FileInputStream(TEST_FILE)), content.getProperty("jcr:data") + .getStream()); } n1.remove(); session.save(); - PrivilegedFileHelper.deleteOnExit(file); - PrivilegedFileHelper.delete(file); + file.deleteOnExit(); + file.delete(); } - @Override protected File createBLOBTempFile(int sizeInb) throws IOException { // create test file byte[] data = new byte[1024]; // 1Kb - File testFile = PrivilegedFileHelper.createTempFile("exportImportFileTest", ".tmp"); - FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + File testFile = File.createTempFile("exportImportFileTest", ".tmp"); + FileOutputStream tempOut = new FileOutputStream(testFile); Random random = new Random(); for (int i = 0; i < sizeInb; i += 1024) @@ -324,9 +323,8 @@ tempOut.write(data); } tempOut.close(); - PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " - + PrivilegedFileHelper.length(testFile)); + testFile.deleteOnExit(); // delete on test exit + log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + testFile.length()); return testFile; } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestLoadRepo.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestLoadRepo.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestLoadRepo.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -24,10 +24,11 @@ import org.exoplatform.services.jcr.impl.tools.tree.ValueSsh1Comparator; import org.exoplatform.services.jcr.impl.tools.tree.ValueSsh1Generator; import org.exoplatform.services.jcr.impl.tools.tree.generator.RandomValueNodeGenerator; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.BufferedOutputStream; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -59,7 +60,7 @@ { Node testNode = root.addNode("testNode"); File checkSummValue = new File(System.getProperty("java.io.tmpdir"), "repo.ssh1"); - BufferedOutputStream sshStrream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(checkSummValue)); + BufferedOutputStream sshStrream = new BufferedOutputStream(new FileOutputStream(checkSummValue)); RandomValueNodeGenerator nodeGenerator = new RandomValueNodeGenerator(session.getValueFactory(), 6, 5, 8, 5, 1024 * 1024); TreeGenerator generator = new TreeGenerator(testNode, nodeGenerator); @@ -69,7 +70,7 @@ ((NodeImpl)testNode).getData().accept(ssh1Generator); sshStrream.close(); File exportFile = new File(System.getProperty("java.io.tmpdir"), "testExport.xml"); - OutputStream os = PrivilegedFileHelper.fileOutputStream(exportFile); + OutputStream os = new FileOutputStream(exportFile); session.exportSystemView(testNode.getPath(), os, false, false); os.close(); } @@ -84,7 +85,7 @@ { File importFile = new File(System.getProperty("java.io.tmpdir"), "testExport.xml"); - InputStream is = PrivilegedFileHelper.fileInputStream(importFile); + InputStream is = new FileInputStream(importFile); session.getWorkspace().getNamespaceRegistry().registerNamespace("exojcrtest_old", "http://www.exoplatform.org/jcr/exojcrtest"); @@ -92,7 +93,7 @@ session.save(); File ssh1File = new File(System.getProperty("java.io.tmpdir"), "repo.ssh1"); - InputStream isSSH1 = PrivilegedFileHelper.fileInputStream(ssh1File); + InputStream isSSH1 = new FileInputStream(ssh1File); ValueSsh1Comparator ssh1Comparator = new ValueSsh1Comparator(session.getTransientNodesManager(), isSSH1); ((NodeImpl)root.getNode("testNode")).getData().accept(ssh1Comparator); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,8 +19,8 @@ package org.exoplatform.services.jcr.load.blob; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import java.io.FileInputStream; import java.io.InputStream; import java.util.Calendar; @@ -43,7 +43,6 @@ // -------------- TEST FILE ------------------ private static String TEST_FILE = null; // URL_SMALL_FILE - @Override public void setUp() throws Exception { super.setUp(); @@ -58,14 +57,14 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); + TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); for (int i = 0; i < FILES_COUNT; i++) { Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -95,7 +94,6 @@ } } - @Override protected void tearDown() throws Exception { testBinaryValue.remove(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue1.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue1.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue1.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,8 +19,8 @@ package org.exoplatform.services.jcr.load.blob; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import java.io.FileInputStream; import java.io.InputStream; import java.util.Calendar; @@ -41,7 +41,6 @@ // -------------- TEST FILE ------------------ private static String TEST_FILE = null; // URL_SMALL_FILE - @Override public void setUp() throws Exception { super.setUp(); @@ -56,14 +55,14 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); + TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); for (int i = 0; i < FILES_COUNT; i++) { Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -100,14 +99,14 @@ startTime = System.currentTimeMillis(); // to get the time of start // 45 Kb - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(45)); + TEST_FILE = createBLOBTempFile(45).getAbsolutePath(); for (int i = 0; i < FILES_COUNT; i++) { Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); // contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "application/octet-stream "); is.close(); @@ -140,7 +139,6 @@ } } - @Override protected void tearDown() throws Exception { testBinaryValue.remove(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/CreateThread.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/CreateThread.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/CreateThread.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.load.blob.thread; import org.exoplatform.services.jcr.impl.core.PropertyImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.load.blob.TestConcurrentItems; import org.exoplatform.services.jcr.util.IdGenerator; @@ -47,7 +46,6 @@ super(threadSession); } - @Override public void testAction() { while (process) @@ -75,7 +73,7 @@ Node ntFile = testRoot.addNode(nodeName, "nt:file"); Node contentNode = ntFile.addNode("jcr:content", "nt:resource"); // dataStream = new URL(TestSwap.URL_BIG_MEDIA_FILE).openStream(); - dataStream = PrivilegedFileHelper.fileInputStream(TestConcurrentItems.TEST_FILE); + dataStream = new FileInputStream(TestConcurrentItems.TEST_FILE); PropertyImpl data = (PropertyImpl)contentNode.setProperty("jcr:data", dataStream); contentNode.setProperty("jcr:mimeType", "video/avi"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/NtFileCreatorThread.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/NtFileCreatorThread.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/thread/NtFileCreatorThread.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.load.blob.thread; import org.exoplatform.services.jcr.impl.core.PropertyImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.load.blob.TestConcurrentItems; import org.exoplatform.services.jcr.util.IdGenerator; @@ -49,7 +48,6 @@ this.testRootName = testRootName; } - @Override public void testAction() { while (process) @@ -78,7 +76,7 @@ Node ntFile = testRoot.addNode(nodeName, "nt:file"); Node contentNode = ntFile.addNode("jcr:content", "nt:resource"); // dataStream = new URL(TestSwap.URL_BIG_MEDIA_FILE).openStream(); - dataStream = PrivilegedFileHelper.fileInputStream(TestConcurrentItems.TEST_FILE); + dataStream = new FileInputStream(TestConcurrentItems.TEST_FILE); PropertyImpl data = (PropertyImpl)contentNode.setProperty("jcr:data", dataStream); contentNode.setProperty("jcr:mimeType", "video/avi"); contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -22,7 +22,6 @@ import org.exoplatform.services.jcr.JcrImplBaseTest; import org.exoplatform.services.jcr.impl.core.NodeImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.IOException; @@ -165,8 +164,7 @@ super.setUp(); fails = new ArrayList<String>(); - contentFile = - new URL("file:///" + PrivilegedFileHelper.getAbsolutePath(new File("src/test/resources/index/test_index.doc"))); + contentFile = new URL("file:///" + new File("src/test/resources/index/test_index.doc").getAbsolutePath()); initDB(); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,8 +18,6 @@ */ package org.exoplatform.services.jcr.load.perf; -import org.exoplatform.services.jcr.JcrAPIBaseTest; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.PrintWriter; @@ -27,6 +25,8 @@ import javax.jcr.Node; +import org.exoplatform.services.jcr.JcrAPIBaseTest; + /** * Created by The eXo Platform SAS Author : Peter Nedonosko peter.nedonosko(a)exoplatform.com.ua * 20.07.2006 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestPerformance.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestPerformance.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestPerformance.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -19,9 +19,9 @@ package org.exoplatform.services.jcr.load.perf; import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.IdGenerator; +import java.io.FileInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.Calendar; @@ -45,7 +45,6 @@ private static String TEST_FILE = null; - @Override public void setUp() throws Exception { super.setUp(); @@ -66,7 +65,6 @@ } } - @Override public void tearDown() throws Exception { } @@ -431,7 +429,7 @@ // variables for the execution time int FILE_SIZE = 100;// 100 K Node testAddNtFilePlusNtResource = testRoot.addNode("testAddNtFilePlusNtResource", "nt:unstructured"); - TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(FILE_SIZE)); + TEST_FILE = createBLOBTempFile(FILE_SIZE).getAbsolutePath(); long startTime = System.currentTimeMillis(); for (int i = 0; i < NODES_COUNT_SHORT_SESSION; i++) { @@ -439,7 +437,7 @@ Node cool = testAddNtFilePlusNtResource.addNode(name, "nt:file"); Node contentNode = cool.addNode("jcr:content", "nt:resource"); contentNode.setProperty("jcr:encoding", "UTF-8"); - InputStream is = PrivilegedFileHelper.fileInputStream(TEST_FILE); + InputStream is = new FileInputStream(TEST_FILE); contentNode.setProperty("jcr:data", is); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); @@ -516,8 +514,8 @@ // byte SYMBOL = 65; // symbol A // byte[] data = new byte[BUFFER_SIZE]; // 1KB // Arrays.fill(data, (byte) SYMBOL); // symbol A - // File testFile = PrivilegedFileHelper.createTempFile(prefix, ".tmp"); - // FileOutputStream tempOut = PrivilegedFileHelper.fileOutputStream(testFile); + // File testFile = File.createTempFile(prefix, ".tmp"); + // FileOutputStream tempOut = new FileOutputStream(testFile); // for (int i = 0; i < sizeInKb; i++) { // tempOut.write(data); // } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -20,7 +20,6 @@ import junit.framework.TestCase; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.SIDGenerator; import java.io.File; @@ -106,26 +105,24 @@ } - @Override protected void setUp() throws Exception { super.setUp(); testRoot = new File("target/fstest"); - PrivilegedFileHelper.mkdirs(testRoot); - PrivilegedFileHelper.deleteOnExit(testRoot); + testRoot.mkdirs(); + testRoot.deleteOnExit(); } - @Override protected void tearDown() throws Exception { long time = System.currentTimeMillis(); - if (PrivilegedFileHelper.exists(testRoot)) + if (testRoot.exists()) { deleteDir(testRoot); // deleteFiles(files); - PrivilegedFileHelper.delete(testRoot); + testRoot.delete(); log.info("Tear down of " + getName() + ",\t" + (System.currentTimeMillis() - time)); } @@ -136,46 +133,46 @@ { for (File f : filesList) { - PrivilegedFileHelper.delete(f); + f.delete(); deleteFileParent(new File(f.getParent())); } } protected void deleteFileParent(File fp) { - if (PrivilegedFileHelper.getAbsolutePath(fp).startsWith(PrivilegedFileHelper.getAbsolutePath(testRoot))) + if (fp.getAbsolutePath().startsWith(testRoot.getAbsolutePath())) if (fp.isDirectory()) { - String[] ls = PrivilegedFileHelper.list(fp); + String[] ls = fp.list(); if (ls.length <= 0) { // log.info("del " + fp.getAbsolutePath()); - PrivilegedFileHelper.delete(fp); + fp.delete(); deleteFileParent(new File(fp.getParent())); } } else - fail("Dir can't be a file but found " + PrivilegedFileHelper.getAbsolutePath(fp)); + fail("Dir can't be a file but found " + fp.getAbsolutePath()); } protected void deleteDir(File dir) { - String[] ls = PrivilegedFileHelper.list(dir); + String[] ls = dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); - fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); + fail("Dir not found " + dir.getAbsolutePath()); } for (String fn : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fn); + File f = new File(dir.getAbsolutePath() + File.separator + fn); if (f.isDirectory()) { deleteDir(f); - PrivilegedFileHelper.delete(f); + f.delete(); } else - PrivilegedFileHelper.delete(f);; + f.delete(); } } @@ -184,14 +181,14 @@ List<File> files = new ArrayList<File>(); for (int i = 0; i < FILES_COUNT; i++) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + SIDGenerator.generate()); + File f = new File(testRoot.getAbsolutePath() + File.separator + SIDGenerator.generate()); try { // f.createNewFile(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fos = new FileOutputStream(f); try { - fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); + fos.write(("File content " + f.getAbsolutePath()).getBytes()); } finally { @@ -213,16 +210,16 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + buildPathX(fileName)); - PrivilegedFileHelper.mkdirs(dir); - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); + File dir = new File(testRoot.getAbsolutePath() + buildPathX(fileName)); + dir.mkdirs(); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fos = new FileOutputStream(f); try { - fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); + fos.write(("File content " + f.getAbsolutePath()).getBytes()); } finally { @@ -255,16 +252,16 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + buildPathXX(fileName)); - PrivilegedFileHelper.mkdirs(dir); - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); + File dir = new File(testRoot.getAbsolutePath() + buildPathXX(fileName)); + dir.mkdirs(); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fos = new FileOutputStream(f); try { - fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); + fos.write(("File content " + f.getAbsolutePath()).getBytes()); } finally { @@ -301,18 +298,16 @@ String fileName = SIDGenerator.generate(); String prefix = fileName.substring(0, 24); // time + addr hash prefix String rnd = fileName.substring(24); // random name - File dir = - new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + prefix + File.separator - + buildPathX(rnd)); - PrivilegedFileHelper.mkdirs(dir); - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); + File dir = new File(testRoot.getAbsolutePath() + File.separator + prefix + File.separator + buildPathX(rnd)); + dir.mkdirs(); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fos = new FileOutputStream(f); try { - fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); + fos.write(("File content " + f.getAbsolutePath()).getBytes()); } finally { @@ -347,12 +342,12 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + buildPathX8(fileName)); - PrivilegedFileHelper.mkdirs(dir); - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); + File dir = new File(testRoot.getAbsolutePath() + File.separator + buildPathX8(fileName)); + dir.mkdirs(); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); + FileOutputStream fos = new FileOutputStream(f); try { fos.write(("qazws").getBytes()); @@ -381,10 +376,10 @@ // long time = System.currentTimeMillis(); // log.info(">>> Step into directory " + root.getAbsolutePath() + // (filter != null ? ", searched file " + filter.getName() : "")); - String[] ls = filter != null ? PrivilegedFileHelper.list(root, filter) : root.list(); + String[] ls = filter != null ? root.list(filter) : root.list(); for (String file : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + file); + File f = new File(testRoot.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir @@ -395,7 +390,7 @@ // file try { - FileInputStream fis = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fis = new FileInputStream(f); fis.close(); } catch (FileNotFoundException e) @@ -419,29 +414,29 @@ protected void readTreeXFiles(File root, NameFilter filter) { - String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathX(filter.getName()); + String dirPath = root.getAbsolutePath() + buildPathX(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); + String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); - fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); + fail("Dir not found " + dir.getAbsolutePath()); } for (String file : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); + fail("The file can't be a dir but found " + f.getAbsolutePath()); } else { // file try { - FileInputStream fis = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fis = new FileInputStream(f); fis.close(); } catch (FileNotFoundException e) @@ -458,29 +453,29 @@ protected void readTreeX8Files(File root, NameFilter filter) { - String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathX8(filter.getName()); + String dirPath = root.getAbsolutePath() + buildPathX8(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); + String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); - fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); + fail("Dir not found " + dir.getAbsolutePath()); } for (String file : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); + fail("The file can't be a dir but found " + f.getAbsolutePath()); } else { // file try { - FileInputStream fis = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fis = new FileInputStream(f); fis.close(); } catch (FileNotFoundException e) @@ -502,29 +497,29 @@ protected void readTreeXXFiles(File root, NameFilter filter) { - String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathXX(filter.getName()); + String dirPath = root.getAbsolutePath() + buildPathXX(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); + String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); - fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); + fail("Dir not found " + dir.getAbsolutePath()); } for (String file : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); + fail("The file can't be a dir but found " + f.getAbsolutePath()); } else { // file try { - FileInputStream fis = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fis = new FileInputStream(f); fis.close(); } catch (FileNotFoundException e) @@ -549,30 +544,28 @@ String fileName = filter.getName(); String prefix = fileName.substring(0, 24); // time + addr hash prefix String rnd = fileName.substring(24); // random name - File dir = - new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + prefix + File.separator - + buildPathX(rnd)); - String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); + File dir = new File(testRoot.getAbsolutePath() + File.separator + prefix + File.separator + buildPathX(rnd)); + String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); - fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); + fail("Dir not found " + dir.getAbsolutePath()); } for (String file : ls) { - File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); + fail("The file can't be a dir but found " + f.getAbsolutePath()); } else { // file try { - FileInputStream fis = PrivilegedFileHelper.fileInputStream(f); + FileInputStream fis = new FileInputStream(f); fis.close(); } catch (FileNotFoundException e) 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-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -21,15 +21,19 @@ import org.exoplatform.services.jcr.dataflow.serialization.ObjectReader; import org.exoplatform.services.jcr.dataflow.serialization.ObjectWriter; import org.exoplatform.services.jcr.dataflow.serialization.UnknownClassIdException; +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.dataflow.serialization.ObjectReaderImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.ObjectWriterImpl; import org.exoplatform.services.jcr.impl.dataflow.serialization.PersistedValueDataReader; import org.exoplatform.services.jcr.impl.dataflow.serialization.PersistedValueDataWriter; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; +import org.exoplatform.services.jcr.impl.util.io.FileCleaner; import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; import java.io.IOException; /** @@ -51,9 +55,9 @@ // vd.setMaxBufferSize(200*1024); // assertNull(vd.getFile()); // not spooling by default until getAsStream() will be call - File serf = PrivilegedFileHelper.createTempFile("serialization", "test"); + File serf = File.createTempFile("serialization", "test"); - ObjectWriter wr = new ObjectWriterImpl(PrivilegedFileHelper.fileOutputStream(serf)); + ObjectWriter wr = new ObjectWriterImpl(new FileOutputStream(serf)); PersistedValueDataWriter vdw = new PersistedValueDataWriter(); vdw.write(wr, vd); @@ -63,7 +67,7 @@ vd = null; // read first time - ObjectReader or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(serf)); + ObjectReader or = new ObjectReaderImpl(new FileInputStream(serf)); FilePersistedValueData vd1 = null; @@ -79,10 +83,10 @@ or.close(); // Imitation save - ((StreamPersistedValueData)vd1).setPersistedFile(((StreamPersistedValueData)vd1).getTempFile()); + ((StreamPersistedValueData) vd1).setPersistedFile(((StreamPersistedValueData) vd1).getTempFile()); // read second time - or = new ObjectReaderImpl(PrivilegedFileHelper.fileInputStream(serf)); + or = new ObjectReaderImpl(new FileInputStream(serf)); FilePersistedValueData vd2 = null; try @@ -95,10 +99,11 @@ } or.close(); // Imitation save - ((StreamPersistedValueData)vd2).setPersistedFile(((StreamPersistedValueData)vd2).getTempFile()); + ((StreamPersistedValueData) vd2).setPersistedFile(((StreamPersistedValueData) vd2).getTempFile()); - assertTrue(PrivilegedFileHelper.exists(vd1.getFile())); - assertTrue(PrivilegedFileHelper.exists(vd2.getFile())); + assertTrue(vd1.getFile().exists()); + assertTrue(vd2.getFile().exists()); + // remove first one vd1 = null; try @@ -110,8 +115,8 @@ // TODO Auto-generated catch block e.printStackTrace(); } - assertTrue(PrivilegedFileHelper.exists(vd2.getFile())); + assertTrue(vd2.getFile().exists()); - PrivilegedFileHelper.delete(f); + f.delete(); } } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestRollbackBigFiles.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -34,7 +34,6 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.storage.JCRInvalidItemStateException; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.util.IdGenerator; import java.io.File; @@ -84,7 +83,7 @@ File f = this.createBLOBTempFile(1024); TransientPropertyData newProperty = new TransientPropertyData(propPath.getInternalPath(), IdGenerator.generate(), -1, PropertyType.BINARY, newNode - .getIdentifier(), false, new TransientValueData(PrivilegedFileHelper.fileInputStream(f))); + .getIdentifier(), false, new TransientValueData(new FileInputStream(f))); list.add(new ItemState(newProperty, ItemState.ADDED, false, parent.getQPath())); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/TestExportImportAmongSessions.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/TestExportImportAmongSessions.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/common/TestExportImportAmongSessions.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.usecases.common; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.usecases.BaseUsecasesTest; import java.io.ByteArrayInputStream; @@ -65,18 +64,17 @@ testNtFileContent.setProperty("jcr:data", new ByteArrayInputStream(TEST_BINARY_CONTENT)); session1.save(); - File outputFile = PrivilegedFileHelper.createTempFile("jcr_bin_test-", ".tmp"); - PrivilegedFileHelper.deleteOnExit(outputFile); + File outputFile = File.createTempFile("jcr_bin_test-", ".tmp"); + outputFile.deleteOnExit(); - session1.exportDocumentView(testNode.getPath(), PrivilegedFileHelper.fileOutputStream(outputFile), false, false); + session1.exportDocumentView(testNode.getPath(), new FileOutputStream(outputFile), false, false); testNode.remove(); session1.save(); try { - session1.importXML("/", PrivilegedFileHelper.fileInputStream(outputFile), - ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); + session1.importXML("/", new FileInputStream(outputFile), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); session1.save(); testNode = session1.getRootNode().getNode(TEST_NODE); @@ -115,18 +113,17 @@ InputStream storedData = ntFile.getProperty("jcr:content/jcr:data").getStream(); assertTrue("BEFORE EXPORT/IMPORT. Binary content must be same", checkBinaryEquals(etalonData, storedData)); - File outputFile = PrivilegedFileHelper.createTempFile("jcr_bin_test", ".tmp"); - PrivilegedFileHelper.deleteOnExit(outputFile); + File outputFile = File.createTempFile("jcr_bin_test", ".tmp"); + outputFile.deleteOnExit(); - session2.exportDocumentView(testNode.getPath(), PrivilegedFileHelper.fileOutputStream(outputFile), false, false); + session2.exportDocumentView(testNode.getPath(), new FileOutputStream(outputFile), false, false); testNode.remove(); session2.save(); try { - session1.importXML("/", PrivilegedFileHelper.fileInputStream(outputFile), - ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); + session1.importXML("/", new FileInputStream(outputFile), ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW); testNode = session1.getRootNode().getNode(TEST_NODE); ntFile = testNode.getNode(TEST_NTFILE); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -27,10 +27,10 @@ import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.jcr.impl.core.SessionImpl; import org.exoplatform.services.jcr.impl.core.SysViewWorkspaceInitializer; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.usecases.BaseUsecasesTest; import java.io.File; +import java.io.FileOutputStream; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -56,7 +56,7 @@ // 1-st export File f1 = new File("target/1.xml"); - sessionWS1.exportWorkspaceSystemView(PrivilegedFileHelper.fileOutputStream(f1), false, false); + sessionWS1.exportWorkspaceSystemView(new FileOutputStream(f1), false, false); // 1-st import WorkspaceEntry ws1_restore_1 = @@ -77,7 +77,7 @@ // 2-st export SessionImpl back1 = (SessionImpl)repository.login(credentials, "ws1_restore_1"); File f2 = new File("target/2.xml"); - back1.exportWorkspaceSystemView(PrivilegedFileHelper.fileOutputStream(f2), false, false); + back1.exportWorkspaceSystemView(new FileOutputStream(f2), false, false); // 2-st import WorkspaceEntry ws1_restore_2 = Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/version/FileRestoreTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/version/FileRestoreTest.java 2010-06-15 08:26:28 UTC (rev 2592) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/version/FileRestoreTest.java 2010-06-15 08:44:56 UTC (rev 2593) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.usecases.version; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.usecases.BaseUsecasesTest; import java.io.File; @@ -44,16 +43,16 @@ public void testBigFileRestore() throws Exception { - File tempFile = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - File tempFile2 = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - File tempFile3 = PrivilegedFileHelper.createTempFile("tempFile", "doc"); - PrivilegedFileHelper.deleteOnExit(tempFile); - PrivilegedFileHelper.deleteOnExit(tempFile2); - PrivilegedFileHelper.deleteOnExit(tempFile3); + File tempFile = File.createTempFile("tempFile", "doc"); + File tempFile2 = File.createTempFile("tempFile", "doc"); + File tempFile3 = File.createTempFile("tempFile", "doc"); + tempFile.deleteOnExit(); + tempFile2.deleteOnExit(); + tempFile3.deleteOnExit(); - FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(tempFile); - FileOutputStream fos2 = PrivilegedFileHelper.fileOutputStream(tempFile2); - FileOutputStream fos3 = PrivilegedFileHelper.fileOutputStream(tempFile3); + FileOutputStream fos = new FileOutputStream(tempFile); + FileOutputStream fos2 = new FileOutputStream(tempFile2); + FileOutputStream fos3 = new FileOutputStream(tempFile3); String content = "this is the content #1"; String content2 = "this is the content #2_"; @@ -70,13 +69,13 @@ fos2.close(); fos3.close(); - log.info("FILE for VERSION #1 : file size = " + PrivilegedFileHelper.length(tempFile) + " bytes"); - log.info("FILE for VERSION #2 : file size = " + PrivilegedFileHelper.length(tempFile2) + " bytes"); - log.info("FILE for VERSION #3 : file size = " + PrivilegedFileHelper.length(tempFile3) + " bytes"); + log.info("FILE for VERSION #1 : file size = " + tempFile.length() + " bytes"); + log.info("FILE for VERSION #2 : file size = " + tempFile2.length() + " bytes"); + log.info("FILE for VERSION #3 : file size = " + tempFile3.length() + " bytes"); Node file = root.addNode("nt_file_node", "nt:file"); Node contentNode = file.addNode("jcr:content", "nt:resource"); - contentNode.setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile)); + contentNode.setProperty("jcr:data", new FileInputStream(tempFile)); contentNode.setProperty("jcr:mimeType", "text/plain"); contentNode.setProperty("jcr:lastModified", session.getValueFactory().createValue(Calendar.getInstance())); file.addMixin("mix:versionable"); @@ -86,38 +85,37 @@ file.checkin(); // v1 file.checkout(); // file.getNode("jcr:content").getProperty("jcr:data").getStream() - file.getNode("jcr:content").setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile2)); + file.getNode("jcr:content").setProperty("jcr:data", new FileInputStream(tempFile2)); session.save(); log .info("ADD VERSION #2 : file size = " + contentNode.getProperty("jcr:data").getStream().available() + " bytes"); - compareStream(PrivilegedFileHelper.fileInputStream(tempFile2), contentNode.getProperty("jcr:data").getStream()); + compareStream(new FileInputStream(tempFile2), contentNode.getProperty("jcr:data").getStream()); file.checkin(); // v2 file.checkout(); - file.getNode("jcr:content").setProperty("jcr:data", PrivilegedFileHelper.fileInputStream(tempFile3)); + file.getNode("jcr:content").setProperty("jcr:data", new FileInputStream(tempFile3)); session.save(); log .info("ADD VERSION #3 : file size = " + contentNode.getProperty("jcr:data").getStream().available() + " bytes"); - compareStream(PrivilegedFileHelper.fileInputStream(tempFile3), contentNode.getProperty("jcr:data").getStream()); + compareStream(new FileInputStream(tempFile3), contentNode.getProperty("jcr:data").getStream()); // restore version v2 Version v2 = file.getBaseVersion(); file.restore(v2, true); - compareStream(PrivilegedFileHelper.fileInputStream(tempFile2), contentNode.getProperty("jcr:data").getStream()); + compareStream(new FileInputStream(tempFile2), contentNode.getProperty("jcr:data").getStream()); // restore version v1 Version v1 = file.getBaseVersion().getPredecessors()[0]; file.restore(v1, true); // HERE - compareStream(PrivilegedFileHelper.fileInputStream(tempFile), contentNode.getProperty("jcr:data").getStream()); + compareStream(new FileInputStream(tempFile), contentNode.getProperty("jcr:data").getStream()); // restore version v2 again file.restore(v2, true); - compareStream(PrivilegedFileHelper.fileInputStream(tempFile2), file.getNode("jcr:content") - .getProperty("jcr:data").getStream()); + compareStream(new FileInputStream(tempFile2), file.getNode("jcr:content").getProperty("jcr:data").getStream()); } }