June 2010 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r2576 - jcr/trunk/exo.jcr.component.core.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-06-14 08:06:33 -0400 (Mon, 14 Jun 2010) New Revision: 2576 Modified: jcr/trunk/exo.jcr.component.core/pom.xml Log: EXOJCR-756 ant task disabled Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-14 12:04:15 UTC (rev 2575) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-14 12:06:33 UTC (rev 2576) @@ -468,7 +468,7 @@ <goal>run</goal> </goals> </execution> - <execution> +  </executions> <dependencies> <dependency>

14 years

1
0
0 / 0

exo-jcr SVN: r2575 - kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-14 08:04:15 -0400 (Mon, 14 Jun 2010) New Revision: 2575 Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java Log: EXOJCR-770: Added changes in javadoc header. Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:59:38 UTC (rev 2574) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 12:04:15 UTC (rev 2575) @@ -26,9 +26,7 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $$Id${file_name} 34360 2009-07-22 23:58:59Z Natasha Vakulenko$$ - * - * ${tags} + * @version $Id$ */ public class TestSecureList extends AbstractSecureCollectionsTest Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:59:38 UTC (rev 2574) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 12:04:15 UTC (rev 2575) @@ -25,8 +25,7 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $$Id${file_name} 34360 2009-07-22 23:58:59Z Natasha Vakulenko$$ * - * ${tags} + * @version $Id$ */ public class TestSecureSet extends AbstractSecureCollectionsTest

14 years

1
0
0 / 0

exo-jcr SVN: r2574 - kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-14 07:59:38 -0400 (Mon, 14 Jun 2010) New Revision: 2574 Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java Log: EXOJCR-770: Added changes in javadoc header. Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:52:39 UTC (rev 2573) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:59:38 UTC (rev 2574) @@ -26,7 +26,9 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $Id: + * @version $$Id${file_name} 34360 2009-07-22 23:58:59Z Natasha Vakulenko$$ + * + * ${tags} */ public class TestSecureList extends AbstractSecureCollectionsTest Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:52:39 UTC (rev 2573) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:59:38 UTC (rev 2574) @@ -25,7 +25,8 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $Id: + * @version $$Id${file_name} 34360 2009-07-22 23:58:59Z Natasha Vakulenko$$ * + * ${tags} */ public class TestSecureSet extends AbstractSecureCollectionsTest

14 years

1
0
0 / 0

exo-jcr SVN: r2573 - kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-14 07:52:39 -0400 (Mon, 14 Jun 2010) New Revision: 2573 Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java Log: EXOJCR-770: Amended in the header of javadoc. Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:50:43 UTC (rev 2572) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:52:39 UTC (rev 2573) @@ -26,7 +26,7 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $Revision$ + * @version $Id: */ public class TestSecureList extends AbstractSecureCollectionsTest Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:50:43 UTC (rev 2572) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:52:39 UTC (rev 2573) @@ -25,7 +25,7 @@ /** * @author <a href="mailto:natasha.vakulenko@gmail.com">Natasha Vakulenko</a> - * @version $Revision$ + * @version $Id: */ public class TestSecureSet extends AbstractSecureCollectionsTest

14 years

1
0
0 / 0

exo-jcr SVN: r2572 - in jcr/trunk/exo.jcr.component.core: src/test/resources and 1 other directory.

by do-not-reply＠jboss.org

Author: dkatayev Date: 2010-06-14 07:50:43 -0400 (Mon, 14 Jun 2010) New Revision: 2572 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/test/resources/test.policy Log: EXOJCR-756 test.policy updated. Path to sources and maven repository are set by ant task. Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-14 11:40:29 UTC (rev 2571) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-06-14 11:50:43 UTC (rev 2572) @@ -468,6 +468,28 @@ <goal>run</goal> </goals> </execution> + <execution> + <id>prepare-test-policy</id> + <phase>process-test-resources</phase> + <configuration> + <tasks> + <echo>Creating Access Policy for tests</echo> + <copy todir="${project.build.testOutputDirectory}" overwrite="true"> + <fileset dir="${project.basedir}/src/test/resources/"> + <include name="test.policy"/> + </fileset> + <filterset> + <filter token="MAVEN_REPO" value="${settings.localRepository}"/> + <filter token="MAIN_CLASSES" value="${project.build.outputDirectory}"/> + <filter token="TEST_CLASSES" value="${project.build.testOutputDirectory}"/> + </filterset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> <dependencies> <dependency> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/test.policy =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/test.policy 2010-06-14 11:40:29 UTC (rev 2571) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/test.policy 2010-06-14 11:50:43 UTC (rev 2572) @@ -1,12 +1,14 @@ -grant codeBase "file:/home/tolusha/java/exo-jcr/jcr/trunk/exo.jcr.component.core/target/classes/-"{ - permission java.security.AllPermission; +grant codeBase "@MAVEN_REPO@/-"{ + permission java.security.AllPermission; }; -grant codeBase "file:/home/tolusha/java/exo-dependencies/repository/-"{ - permission java.security.AllPermission; +grant codeBase "@MAIN_CLASSES@/-"{ + permission java.security.AllPermission; }; -grant codeBase "file:/home/tolusha/java/exo-jcr/jcr/trunk/exo.jcr.component.core/target/test-classes/-"{ + + +grant codeBase "@TEST_CLASSES@/-"{ permission java.lang.RuntimePermission "setSecurityManager"; permission java.lang.RuntimePermission "getJCRSystemSession"; permission java.lang.RuntimePermission "manageRepository";

14 years

1
0
0 / 0

exo-jcr SVN: r2571 - kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure.

by do-not-reply＠jboss.org

Author: natasha.vakulenko Date: 2010-06-14 07:40:29 -0400 (Mon, 14 Jun 2010) New Revision: 2571 Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/AbstractSecureCollectionsTest.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java Log: EXOJCR-770: Was added comments and names of exceptions. Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/AbstractSecureCollectionsTest.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/AbstractSecureCollectionsTest.java 2010-06-14 10:52:13 UTC (rev 2570) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/AbstractSecureCollectionsTest.java 2010-06-14 11:40:29 UTC (rev 2571) @@ -23,6 +23,7 @@ import java.net.URL; import java.security.AccessControlContext; import java.security.AccessController; +import java.security.PrivilegedActionException; import java.security.CodeSource; import java.security.Permission; import java.security.Permissions; @@ -31,7 +32,7 @@ /** * @author <a href="mailto:nikolazius@gmail.com">Nikolay Zamosenchuk</a> - * @version $Id: TestSecureSet.java 34360 2009-07-22 23:58:59Z nzamosenchuk $ + * @version $Id$ */ public abstract class AbstractSecureCollectionsTest extends TestCase @@ -43,7 +44,7 @@ * Run privileged action with given privileges. */ protected <T> T doActionWithPermissions(PrivilegedExceptionAction<T> action, Permission... permissions) - throws Exception + throws PrivilegedActionException { Permissions allPermissions = new Permissions(); for (Permission permission : permissions) Property changes on: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/AbstractSecureCollectionsTest.java ___________________________________________________________________ Name: svn:keywords + Id Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 10:52:13 UTC (rev 2570) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java 2010-06-14 11:40:29 UTC (rev 2571) @@ -16,8 +16,9 @@ */ package org.exoplatform.commons.utils.secure; -import java.security.Permission; +import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; +import java.security.AccessControlException; import java.util.List; import java.util.ArrayList; import java.util.Iterator; @@ -33,7 +34,7 @@ private List<String> list; @Override - protected void setUp() + protected void setUp() throws PrivilegedActionException { // establishment of protected set prior to each test list = SecureCollections.secureList(new ArrayList<String>(), MODIFY_PERMISSION); @@ -42,7 +43,7 @@ // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.add("firstString"); list.add("secondString"); @@ -50,13 +51,14 @@ } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } @Override - protected void tearDown() + protected void tearDown() throws PrivilegedActionException { // cleaning protected list after each test try @@ -64,26 +66,27 @@ // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.clear(); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureListAddDenied() + public void testSecureListAddDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.add("string"); return null; @@ -91,39 +94,40 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureListAddPermitted() + public void testSecureListAddPermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.add(0, "string"); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureListClearDenied() + public void testSecureListClearDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.clear(); return null; @@ -131,19 +135,20 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureListIteratorRemovePermitted() + public void testSecureListIteratorRemovePermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { ListIterator<String> iterator = list.listIterator(); iterator.next(); @@ -152,20 +157,20 @@ } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureListRemoveDenied() + public void testSecureListRemoveDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { list.remove(0); return null; @@ -173,26 +178,27 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureIteratorPermitted() + public void testSecureIteratorPermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { Iterator<String> it = list.iterator(); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } Property changes on: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureList.java ___________________________________________________________________ Name: svn:keywords + Id Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 10:52:13 UTC (rev 2570) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java 2010-06-14 11:40:29 UTC (rev 2571) @@ -16,8 +16,9 @@ */ package org.exoplatform.commons.utils.secure; -import java.security.Permissions; import java.security.PrivilegedExceptionAction; +import java.security.PrivilegedActionException; +import java.security.AccessControlException; import java.util.HashSet; import java.util.Set; import java.util.Iterator; @@ -32,7 +33,7 @@ private Set<String> set; @Override - protected void setUp() + protected void setUp() throws PrivilegedActionException { // establishment of protected set prior to each test set = SecureCollections.secureSet(new HashSet<String>(), MODIFY_PERMISSION); @@ -41,7 +42,7 @@ // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.add("firstString"); set.add("secondString"); @@ -49,13 +50,14 @@ } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } @Override - protected void tearDown() + protected void tearDown() throws PrivilegedActionException { // cleaning protected set after each test try @@ -63,46 +65,47 @@ // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.clear(); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureSetAddPermitted() + public void testSecureSetAddPermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.add("string"); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureSetAddDenied() + public void testSecureSetAddDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.add("string"); return null; @@ -110,19 +113,20 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureSetRemoveDenied() + public void testSecureSetRemoveDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.remove(0); return null; @@ -130,59 +134,60 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } - public void testSecureSetRemovePermitted() + public void testSecureSetRemovePermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.remove(0); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureSetIteratorPermitted() + public void testSecureSetIteratorPermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { Iterator<String> iterator = set.iterator(); return null; } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureSetIteratorRemovePermitted() + public void testSecureSetIteratorRemovePermitted() throws PrivilegedActionException { try { // giving MODIFY_PERMISSION doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { Iterator<String> iterator = set.iterator(); iterator.next(); @@ -191,20 +196,20 @@ } }, MODIFY_PERMISSION); } - catch (Exception e) + catch (AccessControlException e) { fail("Modification should be permitted."); } } - public void testSecureSetClearDenied() + public void testSecureSetClearDenied() throws PrivilegedActionException { try { // giving no permissions doActionWithPermissions(new PrivilegedExceptionAction<Object>() { - public Object run() throws Exception + public Object run() throws AccessControlException { set.clear(); return null; @@ -212,8 +217,9 @@ }); fail("Modification should be denied."); } - catch (Exception e) + catch (AccessControlException e) { + // ok } } } Property changes on: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/secure/TestSecureSet.java ___________________________________________________________________ Name: svn:keywords + Id

14 years

1
0
0 / 0

exo-jcr SVN: r2570 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core and 26 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-06-14 06:52:13 -0400 (Mon, 14 Jun 2010) New Revision: 2570 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileValueStorage.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/WriteValue.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SwapFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/BufferedDecoder.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/directory/DirectoryManagerTest.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/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/TestWorkspaceManagement.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/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/dataflow/persistent/TestCleanableFileStreamValueData.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/value/fs/CASableFileIOChannelTestBase.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/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/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/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/dataflow/persistent/TestGetNodesConcurrentModification.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 Log: EXOJCR-756: replace file operations on privileged file operations Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -173,8 +173,9 @@ File sourceConfig = new File(filePath.toURI()); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmm"); File backUp = new File(sourceConfig.getAbsoluteFile() + "_" + format.format(new Date())); - if (!sourceConfig.renameTo(backUp)) - throw new RepositoryException("Can't back up configuration on path " + sourceConfig.getAbsolutePath()); + if (!PrivilegedFileHelper.renameTo(sourceConfig, backUp)) + throw new RepositoryException("Can't back up configuration on path " + + PrivilegedFileHelper.getAbsolutePath(sourceConfig)); saveStream = PrivilegedFileHelper.fileOutputStream(sourceConfig); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -314,7 +314,7 @@ { Matcher m = p.matcher(f.getName()); if (m.matches()) - return f.getAbsolutePath(); + return PrivilegedFileHelper.getAbsolutePath(f); } return null; @@ -450,8 +450,8 @@ (TransientValueData)(propertyData.getValues().get(listFixupStream.get(i).getValueDataId())); // re-init the value - tvd.delegate(new TransientValueData(tvd.getOrderNumber(), null, null, new SpoolFile(listFile.get(i) - .getAbsolutePath()), fileCleaner, -1, null, true)); + tvd.delegate(new TransientValueData(tvd.getOrderNumber(), null, null, new SpoolFile(PrivilegedFileHelper + .getAbsolutePath(listFile.get(i))), fileCleaner, -1, null, true)); } for (int i = 0; i < listFile.size(); i++) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -783,7 +783,8 @@ { vdata = new TransientValueData(currentProperty.getValues().size(), null, null, - new SpoolFile(pfile.getAbsolutePath()), fileCleaner, maxBufferSize, null, true); + new SpoolFile(PrivilegedFileHelper.getAbsolutePath(pfile)), fileCleaner, + maxBufferSize, null, true); } else { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -34,6 +34,7 @@ import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.observation.ExtendedEvent; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -119,7 +120,7 @@ log.debug("add event fire"); File lockFile = new File(rootDir, lock.getNodeIdentifier()); - if (lockFile.exists()) + if (PrivilegedFileHelper.exists(lockFile)) { throw new LockException("Persistent lock information already exists"); } @@ -144,13 +145,13 @@ { log.debug("remove event fire"); File lockFile = new File(rootDir, lock.getNodeIdentifier()); - if (!lockFile.exists()) + if (!PrivilegedFileHelper.exists(lockFile)) { // throw new LockException("Persistent lock information not exists"); log.warn("Persistent lock information for node " + lock.getNodeIdentifier() + " doesn't exists"); return; } - if (!lockFile.delete()) + if (!PrivilegedFileHelper.delete(lockFile)) throw new LockException("Fail to remove lock information"); } @@ -168,7 +169,7 @@ TransactionChangesLog transactionChangesLog = new TransactionChangesLog(); - String[] list = rootDir.list(); + String[] list = PrivilegedFileHelper.list(rootDir); try { @@ -214,11 +215,11 @@ for (int i = 0; i < list.length; i++) { File lockFile = new File(rootDir, list[i]); - if (!lockFile.exists()) + if (!PrivilegedFileHelper.exists(lockFile)) { log.warn("Persistent lock information for node id " + list[i] + " doesn't exists"); } - if (!lockFile.delete()) + if (!PrivilegedFileHelper.delete(lockFile)) throw new LockException("Fail to remove lock information"); } } @@ -288,7 +289,7 @@ throw new RepositoryConfigurationException("Repository service configuration." + " Source name (" + PARAM_ROOT_DIR + ") is expected"); rootDir = new File(root); - if (rootDir.exists()) + if (PrivilegedFileHelper.exists(rootDir)) { if (!rootDir.isDirectory()) { @@ -297,7 +298,7 @@ } else { - if (!rootDir.mkdirs()) + if (!PrivilegedFileHelper.mkdirs(rootDir)) throw new RepositoryException("Can't create dir" + root); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -26,7 +26,6 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -436,7 +435,7 @@ else { LOG.warn("Could not remove temporary file on switch to bytes, fileCleaner not found. " - + spoolFile.getAbsolutePath()); + + PrivilegedFileHelper.getAbsolutePath(spoolFile)); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -34,9 +34,7 @@ import java.io.ByteArrayInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -697,7 +695,7 @@ (spoolFile).release(this); } - if (deleteSpoolFile && spoolFile.exists()) + if (deleteSpoolFile && PrivilegedFileHelper.exists(spoolFile)) { if (!spoolFile.delete()) { @@ -707,12 +705,14 @@ if (LOG.isDebugEnabled()) { - LOG.debug("Could not remove file. Add to fileCleaner " + spoolFile.getAbsolutePath()); + LOG.debug("Could not remove file. Add to fileCleaner " + + PrivilegedFileHelper.getAbsolutePath(spoolFile)); } } else { - LOG.warn("Could not remove temporary file on finalize " + spoolFile.getAbsolutePath()); + LOG.warn("Could not remove temporary file on finalize " + + PrivilegedFileHelper.getAbsolutePath(spoolFile)); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CleanableFilePersistedValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -20,6 +20,7 @@ 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 org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -72,6 +73,7 @@ /** * {@inheritDoc} */ + @Override protected void finalize() throws Throwable { try @@ -79,7 +81,7 @@ // release file ((SwapFile)file).release(this); - if (!file.delete()) + if (!PrivilegedFileHelper.delete(file)) { //TODO FileCleaner maybe null. if (cleaner != null) @@ -89,7 +91,7 @@ if (LOG.isDebugEnabled()) { LOG.debug("Could not remove temporary file on finalize: inUse=" + (((SwapFile)file).inUse()) + ", " - + file.getAbsolutePath()); + + PrivilegedFileHelper.getAbsolutePath(file)); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -237,7 +237,7 @@ File f = new File(new String(buf, "UTF-8")); // validate if exists - if (f.exists()) + if (PrivilegedFileHelper.exists(f)) { file = f; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -88,7 +88,7 @@ public AbstractPersistedValueData read(ObjectReader in) throws UnknownClassIdException, IOException { File tempDirectory = new File(SerializationConstants.TEMP_DIR); - tempDirectory.mkdirs(); + PrivilegedFileHelper.mkdirs(tempDirectory); // read id int key; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -34,6 +34,7 @@ import org.exoplatform.services.jcr.impl.storage.jdbc.statistics.StatisticsJDBCStorageConnection; import org.exoplatform.services.jcr.impl.storage.jdbc.update.StorageUpdateManager; 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.jdbc.DBInitializerException; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; @@ -387,8 +388,8 @@ { this.swapDirectory = new File(DEF_SWAPDIR); } - if (!swapDirectory.exists()) - swapDirectory.mkdirs(); + if (!PrivilegedFileHelper.exists(swapDirectory)) + PrivilegedFileHelper.mkdirs(swapDirectory); this.swapCleaner = new FileCleaner(false); @@ -814,7 +815,7 @@ + "data source JNDI name: " + dbSourceName + "\n" + "is multi database: " + multiDb + "\n" + "storage version: " + storageVersion + "\n" + "value storage provider: " + valueStorageProvider + "\n" + "max buffer size (bytes): " + maxBufferSize + "\n" + "swap directory path: " - + swapDirectory.getAbsolutePath(); + + PrivilegedFileHelper.getAbsolutePath(swapDirectory); return str; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,6 +21,7 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; 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 org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.jcr.storage.value.ValueStoragePlugin; import org.exoplatform.services.log.ExoLogger; @@ -107,22 +108,23 @@ { this.rootDir = new File(rootDirPath); - if (!rootDir.exists()) + if (!PrivilegedFileHelper.exists(rootDir)) { - if (rootDir.mkdirs()) + if (PrivilegedFileHelper.mkdirs(rootDir)) { - log.info("Directory created: " + rootDir.getAbsolutePath()); + log.info("Directory created: " + PrivilegedFileHelper.getAbsolutePath(rootDir)); // create internal temp dir File tempDir = new File(rootDir, TEMP_DIR_NAME); - tempDir.mkdirs(); + PrivilegedFileHelper.mkdirs(tempDir); - if (tempDir.exists() && tempDir.isDirectory()) + if (PrivilegedFileHelper.exists(tempDir) && tempDir.isDirectory()) { // care about storage temp dir cleanup for (File tmpf : tempDir.listFiles()) if (!tmpf.delete()) - log.warn("Storage temporary directory contains un-deletable file " + tmpf.getAbsolutePath() + log.warn("Storage temporary directory contains un-deletable file " + + PrivilegedFileHelper.getAbsolutePath(tmpf) + ". It's recommended to leave this directory for JCR External Values Storage private use."); } else @@ -131,7 +133,7 @@ } else { - log.warn("Directory IS NOT created: " + rootDir.getAbsolutePath()); + log.warn("Directory IS NOT created: " + PrivilegedFileHelper.getAbsolutePath(rootDir)); } } else Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -19,6 +19,7 @@ package org.exoplatform.services.jcr.impl.storage.value.fs; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -73,12 +74,12 @@ protected boolean deleteParent(File fp) { boolean res = false; - String fpPath = fp.getAbsolutePath(); - String rootPath = rootDir.getAbsolutePath(); + String fpPath = PrivilegedFileHelper.getAbsolutePath(fp); + String rootPath = PrivilegedFileHelper.getAbsolutePath(rootDir); if (fpPath.startsWith(rootPath) && fpPath.length() > rootPath.length()) if (fp.isDirectory()) { - String[] ls = fp.list(); + String[] ls = PrivilegedFileHelper.list(fp);; if (ls != null && ls.length <= 0) { if (res = fp.delete()) @@ -87,13 +88,13 @@ } else { - fLog.warn("Parent directory can not be deleted now. " + fp.getAbsolutePath()); - cleaner.addFile(new TreeFile(fp.getAbsolutePath(), cleaner, rootDir)); + fLog.warn("Parent directory can not be deleted now. " + PrivilegedFileHelper.getAbsolutePath(fp)); + cleaner.addFile(new TreeFile(PrivilegedFileHelper.getAbsolutePath(fp), cleaner, rootDir)); } } } else - fLog.warn("Parent can not be a file but found " + fp.getAbsolutePath()); + fLog.warn("Parent can not be a file but found " + PrivilegedFileHelper.getAbsolutePath(fp)); return res; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -164,13 +164,14 @@ try { mkdirsLock.acquire(); - return dir.mkdirs(); + return PrivilegedFileHelper.mkdirs(dir); } catch (InterruptedException e) { // chLog.error("mkdirs error on " + dir.getAbsolutePath() + ". " + e, e); // return false; - throw new IllegalStateException("mkdirs error on " + dir.getAbsolutePath() + " due to " + e, e); + throw new IllegalStateException("mkdirs error on " + PrivilegedFileHelper.getAbsolutePath(dir) + " due to " + + e, e); } finally { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileValueStorage.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileValueStorage.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -19,6 +19,7 @@ package org.exoplatform.services.jcr.impl.storage.value.fs; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.storage.value.ValueIOChannel; import java.io.File; @@ -38,7 +39,7 @@ @Override public synchronized void addFile(File file) { - super.addFile(new TreeFile(file.getAbsolutePath(), cleaner, rootDir)); + super.addFile(new TreeFile(PrivilegedFileHelper.getAbsolutePath(file), cleaner, rootDir)); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -161,9 +161,10 @@ } catch (RecordAlreadyExistsException e) { - if (tempFile != null && tempFile.exists() && !tempFile.delete()) + if (tempFile != null && PrivilegedFileHelper.exists(tempFile) && !tempFile.delete()) { - LOG.warn("Can't delete CAS temp file. Added to file cleaner. " + tempFile.getAbsolutePath()); + LOG.warn("Can't delete CAS temp file. Added to file cleaner. " + + PrivilegedFileHelper.getAbsolutePath(tempFile)); cleaner.addFile(tempFile); } throw new RecordAlreadyExistsException("Write error: " + e, e); @@ -179,8 +180,8 @@ // rename propetynamed file to hashnamed one if (!PrivilegedFileHelper.renameTo(tempFile, vcasFile)) { - throw new VCASException("File " + tempFile.getAbsolutePath() + " can't be renamed to VCAS-named " - + vcasFile.getAbsolutePath()); + throw new VCASException("File " + PrivilegedFileHelper.getAbsolutePath(tempFile) + + " can't be renamed to VCAS-named " + PrivilegedFileHelper.getAbsolutePath(vcasFile)); } } // else - CASed Value already exists Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileIOHelper.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -241,14 +241,16 @@ if ((tempFile = streamed.getTempFile()) != null) { // it's spooled Value, try move its file to VS - if (!tempFile.renameTo(file)) + if (!PrivilegedFileHelper.renameTo(tempFile, file)) { // not succeeded - copy bytes, temp file will be deleted by transient ValueData if (LOG.isDebugEnabled()) { LOG .debug("Value spool file move (rename) to Values Storage is not succeeded. Trying bytes copy. Spool file: " - + tempFile.getAbsolutePath() + ". Destination: " + file.getAbsolutePath()); + + PrivilegedFileHelper.getAbsolutePath(tempFile) + + ". Destination: " + + PrivilegedFileHelper.getAbsolutePath(file)); } copyClose(PrivilegedFileHelper.fileInputStream(tempFile), PrivilegedFileHelper Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -191,7 +191,8 @@ if (!lockFile.delete()) { // TODO don't use FileCleaner, delete should be enough - LOG.warn("Cannot delete lock file " + lockFile.getAbsolutePath() + ". Add to the FileCleaner"); + LOG.warn("Cannot delete lock file " + PrivilegedFileHelper.getAbsolutePath(lockFile) + + ". Add to the FileCleaner"); cleaner.addFile(lockFile); } @@ -261,7 +262,7 @@ } catch (InterruptedException e) { - throw new FileLockException("Lock error on " + file.getAbsolutePath(), e); + throw new FileLockException("Lock error on " + PrivilegedFileHelper.getAbsolutePath(file), e); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/WriteValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/WriteValue.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/WriteValue.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,12 +21,10 @@ import org.exoplatform.services.jcr.datamodel.ValueData; import org.exoplatform.services.jcr.impl.storage.value.ValueDataResourceHolder; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; +import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.io.IOException; -import java.security.AccessController; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; /** * Created by The eXo Platform SAS. @@ -100,37 +98,9 @@ if (fileLock != null) try { - PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>() - { - public Object run() throws Exception - { - // be sure the destination dir exists (case for Tree-style storage) - file.getParentFile().mkdirs(); + // be sure the destination dir exists (case for Tree-style storage) + PrivilegedFileHelper.mkdirs(file.getParentFile()); - return null; - } - }; - try - { - AccessController.doPrivileged(action); - } - catch (PrivilegedActionException pae) - { - Throwable cause = pae.getCause(); - if (cause instanceof IOException) - { - throw (IOException)cause; - } - else if (cause instanceof RuntimeException) - { - throw (RuntimeException)cause; - } - else - { - throw new RuntimeException(cause); - } - } - // write value to the file writeValue(file, value); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/FileCleaner.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -91,7 +91,7 @@ */ public void addFile(File file) { - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) { files.offer(file); } @@ -124,7 +124,7 @@ Set<File> notRemovedFiles = new HashSet<File>(); while ((file = files.poll()) != null) { - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) { if (!file.delete()) { @@ -132,11 +132,12 @@ if (log.isDebugEnabled()) log.debug("Could not delete " + (file.isDirectory() ? "directory" : "file") - + ". Will try next time: " + file.getAbsolutePath()); + + ". Will try next time: " + PrivilegedFileHelper.getAbsolutePath(file)); } else if (log.isDebugEnabled()) { - log.debug((file.isDirectory() ? "Directory" : "File") + " deleted : " + file.getAbsolutePath()); + log.debug((file.isDirectory() ? "Directory" : "File") + " deleted : " + + PrivilegedFileHelper.getAbsolutePath(file)); } } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -22,6 +22,7 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FilenameFilter; import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedAction; @@ -325,17 +326,16 @@ return AccessController.doPrivileged(action); } - public static void mkdirs(final File file) + public static boolean mkdirs(final File file) { - PrivilegedAction<Object> action = new PrivilegedAction<Object>() + PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() { - public Object run() + public Boolean run() { - file.mkdirs(); - return null; + return file.mkdirs(); } }; - AccessController.doPrivileged(action); + return AccessController.doPrivileged(action); } public static boolean renameTo(final File srcFile, final File dstfile) @@ -361,4 +361,16 @@ }; return AccessController.doPrivileged(action); } + + public static String[] list(final File file, final FilenameFilter filter) + { + PrivilegedAction<String[]> action = new PrivilegedAction<String[]>() + { + public String[] run() + { + return file.list(filter); + } + }; + return AccessController.doPrivileged(action); + } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SwapFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SwapFile.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/SwapFile.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -89,7 +89,7 @@ synchronized (inShare) { SwapFile newsf = new SwapFile(parent, child); - String absPath = newsf.getAbsolutePath(); + String absPath = PrivilegedFileHelper.getAbsolutePath(newsf); SwapFile swapped = inShare.get(absPath); if (swapped != null) @@ -104,7 +104,8 @@ catch (final InterruptedException e) { // thinking that is ok, i.e. this thread is interrupted - throw new IOException("Swap file read error " + swapped.getAbsolutePath() + ". " + e) + throw new IOException("Swap file read error " + PrivilegedFileHelper.getAbsolutePath(swapped) + ". " + + e) { @Override public Throwable getCause() Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/BufferedDecoder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/BufferedDecoder.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/BufferedDecoder.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -26,7 +26,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -117,11 +116,12 @@ */ public void remove() throws IOException { - if ((fileBuffer != null) && fileBuffer.exists()) + if ((fileBuffer != null) && PrivilegedFileHelper.exists(fileBuffer)) { - if (!fileBuffer.delete()) + if (!PrivilegedFileHelper.delete(fileBuffer)) { - throw new IOException("Cannot remove file " + fileBuffer.getAbsolutePath() + " Close all streams."); + throw new IOException("Cannot remove file " + PrivilegedFileHelper.getAbsolutePath(fileBuffer) + + " Close all streams."); } } } 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -41,7 +41,7 @@ { File sourceFolder = new File(TEST_FOLDER); // only run if there is test data - if (!sourceFolder.exists()) + if (!PrivilegedFileHelper.exists(sourceFolder)) { return; } @@ -57,7 +57,7 @@ */ private void addContents(File folder, Node n) throws Exception { - String[] names = folder.list(); + String[] names = PrivilegedFileHelper.list(folder); for (int i = 0; i < names.length; i++) { File f = new File(folder, names[i]); @@ -65,13 +65,13 @@ { if (f.isDirectory()) { - log.println("Added folder: " + f.getAbsolutePath()); + log.println("Added folder: " + PrivilegedFileHelper.getAbsolutePath(f)); addContents(f, n.addNode(names[i], "nt:folder")); } else { addFile(n, f); - log.println("Added file: " + f.getAbsolutePath()); + log.println("Added file: " + PrivilegedFileHelper.getAbsolutePath(f)); // save after 100 files if (++fileCount % 100 == 0) { @@ -89,7 +89,7 @@ public void testRepeatedUpdate() throws Exception { File testFile = new File("test.pdf"); - if (!testFile.exists()) + if (!PrivilegedFileHelper.exists(testFile)) { return; } 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -23,6 +23,7 @@ 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; @@ -47,7 +48,7 @@ static { - INDEX.setPath(new File(new File("target"), "directory-factory-test").getAbsolutePath()); + INDEX.setPath(PrivilegedFileHelper.getAbsolutePath(new File(new File("target"), "directory-factory-test"))); } @Override 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/nodetypes/TestValueConstraints.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -25,7 +25,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; import java.io.InputStream; import javax.jcr.Node; @@ -60,9 +59,9 @@ { super.setUp(); - LOCAL_SMALL_FILE = createBLOBTempFile(16).getAbsolutePath(); // 16Kb - LOCAL_BIG_FILE = createBLOBTempFile(16 * 1024).getAbsolutePath(); // 16Mb - LOCAL_NORMAL_FILE = createBLOBTempFile(17).getAbsolutePath(); // 17Kb + 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 byte[] xmlData = readXmlContent("/org/exoplatform/services/jcr/api/nodetypes/nodetypes-api-test.xml"); ByteArrayInputStream xmlInput = new ByteArrayInputStream(xmlData); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestMoveNode.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -23,7 +23,6 @@ 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; @@ -220,7 +219,7 @@ for (int i = 0; i < FILES_COUNT; i++) { - TEST_FILE = createBLOBTempFile("testMove", random.nextInt(1024)).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile("testMove", random.nextInt(1024))); filesList.add(TEST_FILE); Node localBigFile = testLocalBigFiles.addNode("bigFile" + i, "nt:file"); Node contentNode = localBigFile.addNode("jcr:content", "nt:resource"); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -70,7 +70,7 @@ root.save(); is.close(); - f.renameTo(new File("./sv_export_binary.bin")); + PrivilegedFileHelper.renameTo(f, new File("./sv_export_binary.bin")); File outf = new File("./sv_export_root.xml"); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(outf); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestWorkspaceManagement.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -144,8 +144,10 @@ PrivilegedFileHelper.deleteOnExit(file); WorkspaceEntry workspaceEntry = - helper.getNewWs("WsInvalidVs", isDefaultWsMultiDb, wsEntry.getContainer().getParameterValue( - JDBCWorkspaceDataContainer.SOURCE_NAME), file.getAbsolutePath(), wsEntry.getContainer()); + helper + .getNewWs("WsInvalidVs", isDefaultWsMultiDb, wsEntry.getContainer().getParameterValue( + JDBCWorkspaceDataContainer.SOURCE_NAME), PrivilegedFileHelper.getAbsolutePath(file), wsEntry + .getContainer()); try { helper.createWorkspace(workspaceEntry, container); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -50,7 +50,7 @@ { File file = new File("src/test/resources/ArabicUTF8.txt"); - assertTrue("/test/resources/ArabicUTF8.txt not found", file.exists()); + assertTrue("/test/resources/ArabicUTF8.txt not found", PrivilegedFileHelper.exists(file)); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -49,7 +49,7 @@ public void testSearchDate() throws Exception { File file = new File("src/test/resources/test.xls"); - assertTrue("/test/resources/test.xls not found", file.exists()); + assertTrue("/test/resources/test.xls not found", PrivilegedFileHelper.exists(file)); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -46,7 +46,7 @@ public void testFindFileContent() throws Exception { File file = new File("src/test/resources/test.xls"); - assertTrue("/test/resources/book.xls not found", file.exists()); + assertTrue("/test/resources/book.xls not found", PrivilegedFileHelper.exists(file)); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/lucene/TestErrorLog.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -45,7 +45,7 @@ { super.setUp(); file = PrivilegedFileHelper.createTempFile("error", "log"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) { file.delete(); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -103,7 +103,7 @@ testCleaner.halt(); testCleaner = null; - if (testFile.exists()) + if (PrivilegedFileHelper.exists(testFile)) { testFile.delete(); } @@ -121,7 +121,7 @@ public void testFileCleaned() throws InterruptedException { - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); cleanableValueData = null; // CleanableVD dies @@ -131,20 +131,20 @@ Thread.yield(); System.gc(); - assertFalse(testFile.exists()); // file released and deleted + assertFalse(PrivilegedFileHelper.exists(testFile)); // file released and deleted } public void testSharedFileNotCleaned() throws InterruptedException, IOException { - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); CleanableFilePersistedValueData cfvd2 = new CleanableFilePersistedValueData(1, SwapFile.get(parentDir, FILE_NAME), testCleaner); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); cleanableValueData = null; // CleanableVD dies but another instance points swapped file @@ -154,7 +154,7 @@ Thread.yield(); System.gc(); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); // clean ValueData cfvd2 = null; @@ -165,19 +165,19 @@ Thread.yield(); System.gc(); - assertFalse(testFile.exists()); + assertFalse(PrivilegedFileHelper.exists(testFile)); } public void testTransientFileNotCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); trvd = null; // TransientVD dies @@ -187,19 +187,19 @@ Thread.yield(); System.gc(); - assertTrue(testFile.exists()); // but Swapped CleanableVD lives and uses the file + assertTrue(PrivilegedFileHelper.exists(testFile)); // but Swapped CleanableVD lives and uses the file } public void testTransientFileCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); cleanableValueData = null; // CleanableVD dies but TransientVD still uses swapped file @@ -209,7 +209,7 @@ Thread.yield(); System.gc(); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); trvd = null; // TransientVD dies @@ -219,13 +219,13 @@ Thread.yield(); System.gc(); - assertFalse(testFile.exists()); // swapped file deleted + assertFalse(PrivilegedFileHelper.exists(testFile)); // swapped file deleted } public void testTransientSharedFileCleaned() throws InterruptedException, IOException, RepositoryException { - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); System.gc(); Thread.sleep(CLEANER_TIMEOUT / 2); @@ -233,7 +233,7 @@ // file shared with TransientVD TransientValueData trvd = cleanableValueData.createTransientCopy(); - assertTrue(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); // 1st CleanableVD die cleanableValueData = null; @@ -247,7 +247,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(testFile.exists()); + assertTrue(PrivilegedFileHelper.exists(testFile)); trvd = null; // TransientVD dies @@ -257,7 +257,7 @@ Thread.yield(); System.gc(); - assertTrue(testFile.exists()); // still exists, aquired by 2nd CleanableVD + assertTrue(PrivilegedFileHelper.exists(testFile)); // still exists, aquired by 2nd CleanableVD cfvd2 = null; // 2nd CleanableVD dies @@ -267,7 +267,7 @@ Thread.yield(); System.gc(); - assertFalse(testFile.exists()); // file should be deleted + assertFalse(PrivilegedFileHelper.exists(testFile)); // file should be deleted } } 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/ValueStoragePluginTest.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -33,7 +33,6 @@ import java.io.BufferedInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -247,7 +246,8 @@ } tempOut.close(); PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + PrivilegedFileHelper.length(testFile)); + log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " + + PrivilegedFileHelper.length(testFile)); return testFile; } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -70,12 +70,12 @@ if (rootDir == null) { rootDir = new File("target/temp/values-test"); - rootDir.mkdirs(); + PrivilegedFileHelper.mkdirs(rootDir); - new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); + PrivilegedFileHelper.mkdirs(new File(rootDir, FileValueStorage.TEMP_DIR_NAME)); - if (!rootDir.exists()) - throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); + if (!PrivilegedFileHelper.exists(rootDir)) + throw new Exception("Folder does not exist " + PrivilegedFileHelper.getAbsolutePath(rootDir)); } if (storageId == null) @@ -118,7 +118,8 @@ File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum // =0 - assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); + assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper + .exists(vsfile)); InputStream etalon, tested; compareStream(etalon = PrivilegedFileHelper.fileInputStream(testFile), tested = @@ -243,7 +244,8 @@ fch.delete(propertyId); fch.commit(); - assertFalse("File should not exists " + vsfile.getAbsolutePath(), vsfile.exists()); + assertFalse("File should not exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper + .exists(vsfile)); } /** @@ -322,7 +324,8 @@ File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); - assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); + assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper + .exists(vsfile)); assertEquals("Storage size must be increased on size of ONE file ", initialSize + PrivilegedFileHelper.length(testFile), calcDirSize(rootDir)); @@ -352,7 +355,8 @@ File vsfile = new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); - assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); + assertTrue("File should exists " + PrivilegedFileHelper.getAbsolutePath(vsfile), PrivilegedFileHelper + .exists(vsfile)); assertEquals("Storage size must be increased on size of ALL files ", initialSize + addedSize, calcDirSize(rootDir)); @@ -622,12 +626,12 @@ long count = 0; for (File sf : dir.listFiles()) { - if (sf.isDirectory() && sf.list().length > 0) + if (sf.isDirectory() && PrivilegedFileHelper.list(sf).length > 0) count += deleteRecursive(sf); else if (sf.delete()) count += 1; else - LOG.warn("Can't delete file " + sf.getAbsolutePath()); + LOG.warn("Can't delete file " + PrivilegedFileHelper.getAbsolutePath(sf)); } count += dir.delete() ? 1 : 0; return count; Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -58,12 +58,12 @@ super.setUp(); rootDir = new File(new File("target"), "vs1"); - rootDir.mkdirs(); + PrivilegedFileHelper.mkdirs(rootDir); - new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); + PrivilegedFileHelper.mkdirs(new File(rootDir, FileValueStorage.TEMP_DIR_NAME)); - if (!rootDir.exists()) - throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); + if (!PrivilegedFileHelper.exists(rootDir)) + throw new Exception("Folder does not exist " + PrivilegedFileHelper.getAbsolutePath(rootDir)); } @@ -73,7 +73,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File(rootDir, "testReadFromIOChannel0"); PrivilegedFileHelper.deleteOnExit(file); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); @@ -82,7 +82,7 @@ buf = "01234567890123456789".getBytes(); file = new File(rootDir, "testReadFromIOChannel1"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); @@ -135,9 +135,9 @@ } channel.commit(); - assertTrue(new File(rootDir, "testWriteToIOChannel0").exists()); - assertTrue(new File(rootDir, "testWriteToIOChannel1").exists()); - assertTrue(new File(rootDir, "testWriteToIOChannel2").exists()); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel0"))); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel1"))); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testWriteToIOChannel2"))); assertEquals(10, PrivilegedFileHelper.length(new File(rootDir, "testWriteToIOChannel0"))); @@ -156,7 +156,7 @@ channel.commit(); File f = channel.getFile("testWriteUpdate", 0); - assertTrue(f.exists()); + assertTrue(PrivilegedFileHelper.exists(f)); assertEquals(10, PrivilegedFileHelper.length(f)); byte[] buf1 = "qwerty".getBytes(); @@ -164,7 +164,7 @@ channel.commit(); f = channel.getFile("testWriteUpdate", 0); - assertTrue(f.exists()); + assertTrue(PrivilegedFileHelper.exists(f)); assertEquals(6, PrivilegedFileHelper.length(f)); channel.delete("testWriteUpdate"); @@ -198,16 +198,16 @@ } channel.commit(); - assertTrue(new File(rootDir, "testDeleteFromIOChannel0").exists()); - assertTrue(new File(rootDir, "testDeleteFromIOChannel1").exists()); - assertTrue(new File(rootDir, "testDeleteFromIOChannel2").exists()); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel0"))); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel1"))); + assertTrue(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel2"))); channel.delete("testDeleteFromIOChannel"); channel.commit(); - assertFalse(new File(rootDir, "testDeleteFromIOChannel0").exists()); - assertFalse(new File(rootDir, "testDeleteFromIOChannel1").exists()); - assertFalse(new File(rootDir, "testDeleteFromIOChannel2").exists()); + assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel0"))); + assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel1"))); + assertFalse(PrivilegedFileHelper.exists(new File(rootDir, "testDeleteFromIOChannel2"))); channel.delete("testDeleteFromIOChannel"); channel.commit(); @@ -237,8 +237,8 @@ channel.commit(); File f = new File(rootDir, "testConcurrentReadFromIOChannel0"); - if (!f.exists()) - throw new Exception("File does not exist " + f.getAbsolutePath()); + if (!PrivilegedFileHelper.exists(f)) + throw new Exception("File does not exist " + PrivilegedFileHelper.getAbsolutePath(f)); Probe[] p = new Probe[10]; for (int i = 0; i < 10; i++) @@ -296,7 +296,7 @@ f = new File(rootDir, "testDeleteLockedFileFromIOChannel0"); // assertFalse(f.exists()); - System.out.println(">>>>>>>>>>>>>" + f.canRead() + " " + f.exists() + " " + f.canWrite()); + System.out.println(">>>>>>>>>>>>>" + f.canRead() + " " + PrivilegedFileHelper.exists(f) + " " + f.canWrite()); System.out.println(">>>>>>>>>>>>>" + PrivilegedFileHelper.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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -86,7 +86,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadByteArrayValueData"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); @@ -108,7 +108,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testReadFileValueData"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); @@ -137,7 +137,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testWriteFileValueData"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) 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/operations/TestValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -93,13 +93,13 @@ io = new ValueFileIOHelper(); - if (src == null || !src.exists()) + if (src == null || !PrivilegedFileHelper.exists(src)) { src = createBLOBTempFile(7 * 1024); // 7M PrivilegedFileHelper.deleteOnExit(src); } - if (srcSerialization == null || !srcSerialization.exists()) + if (srcSerialization == null || !PrivilegedFileHelper.exists(srcSerialization)) { srcSerialization = PrivilegedFileHelper.createTempFile("srcSerialization", ".tmp"); PrivilegedFileHelper.deleteOnExit(srcSerialization); @@ -124,7 +124,7 @@ } testDir = new File("target/TestValueFileIOHelper"); - testDir.mkdirs(); + PrivilegedFileHelper.mkdirs(testDir); dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); } Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/tools/tree/generator/RandomValueNodeGenerator.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -26,7 +26,6 @@ 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; @@ -193,7 +192,8 @@ } tempOut.close(); PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + PrivilegedFileHelper.length(testFile)); + log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " + + PrivilegedFileHelper.length(testFile)); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -59,7 +59,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamValueData"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); @@ -93,7 +93,7 @@ out.close(); CleanableFilePersistedValueData vd = new CleanableFilePersistedValueData(0, file, new FileCleaner(1000, true)); - assertTrue(file.exists()); + assertTrue(PrivilegedFileHelper.exists(file)); vd = null; System.gc(); @@ -102,7 +102,7 @@ Thread.sleep(2500); System.gc(); - assertFalse(file.exists()); + assertFalse(PrivilegedFileHelper.exists(file)); } public void testConcurrentFileStreamValueDataReading() throws Exception @@ -112,7 +112,7 @@ "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" .getBytes(); File file = new File("target/testConcurrentFileStreamValueDataReading"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); // approx. 10Kb file Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -70,7 +70,7 @@ byte[] buf = "0123456789".getBytes(); File file = new File("target/testCreateFileStreamTransientValueData"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -99,7 +99,7 @@ System.gc(); Thread.sleep(2000); - String[] countBefore = tmpdir.list(new FilenameFilter() + String[] countBefore = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() { public boolean accept(File dir, String name) { @@ -114,7 +114,7 @@ System.gc(); Thread.sleep(2000); - String[] countAfter = tmpdir.list(new FilenameFilter() + String[] countAfter = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() { public boolean accept(File dir, String name) { @@ -138,7 +138,7 @@ System.gc(); Thread.sleep(2000); - String[] countBefore = tmpdir.list(new FilenameFilter() + String[] countBefore = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() { public boolean accept(File dir, String name) { @@ -154,7 +154,7 @@ System.gc(); Thread.sleep(2000); - String[] countAfter = tmpdir.list(new FilenameFilter() + String[] countAfter = PrivilegedFileHelper.list(tmpdir, new FilenameFilter() { public boolean accept(File dir, String name) { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -54,7 +54,7 @@ byte[] buf = "012345678901234567890123456789".getBytes(); File file = new File("target/testNewBinaryValue"); - if (file.exists()) + if (PrivilegedFileHelper.exists(file)) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); out.write(buf); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValue.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,7 +21,6 @@ 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; @@ -80,7 +79,7 @@ if (TEST_FILE == null) { // create test file - TEST_FILE = createBLOBTempFile(2).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(2)); } } @@ -91,7 +90,7 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); for (int i = 0; i < FILES_COUNT; i++) { 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestBinaryValueMultiThreading.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -23,7 +23,6 @@ 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; @@ -140,7 +139,7 @@ if (LOCAL_BIG_FILE == null) { // create test file - LOCAL_BIG_FILE = createBLOBTempFile(3).getAbsolutePath(); + LOCAL_BIG_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(3)); } Node testLocalBigFiles = root.addNode("testLocalBigFiles"); 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestConcurrentItems.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -28,7 +28,6 @@ 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; @@ -89,7 +88,7 @@ // create test file testFile = createBLOBTempFile(1024); dataSize = (int)PrivilegedFileHelper.length(testFile); - TEST_FILE = testFile.getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(testFile); } else { @@ -254,9 +253,9 @@ repository .login( this.credentials /* - * session.getCredentials( - * ) - */, + * session.getCredentials( + * ) + */, "ws1")); readed.start(); readers.add(readed); @@ -272,11 +271,14 @@ log.info("Begin cleaner..."); DeleteThread cleaner = - new DeleteThread(repository.login(this.credentials /* - * session.getCredentials - * () - */, - "ws1")); + new DeleteThread( + repository + .login( + this.credentials /* + * session.getCredentials + * () + */, + "ws1")); cleaner.start(); log.info("<<<<<<<<<<<<<<<<<<<< Wait cycle >>>>>>>>>>>>>>>>>>>>>"); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestExportBigFiles.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -24,7 +24,6 @@ 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; @@ -49,7 +48,7 @@ */ public void testBigExportSysView() throws Exception { - String TEST_FILE = createBLOBTempFile(1024 * 5).getAbsolutePath();// 5M + String TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(1024 * 5));// 5M Node testLocalBigFiles = root.addNode("testLocalBigFiles"); // add file to repository @@ -113,7 +112,7 @@ */ public void testBigImportExportDocView() throws Exception { - String TEST_FILE2 = createBLOBTempFile(1024 * 5).getAbsolutePath(); // 5M + String TEST_FILE2 = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(1024 * 5)); // 5M Node testLocalBigFiles = root.addNode("testDocView"); // add file to repository @@ -238,7 +237,7 @@ for (int i = 0; i < FILES_COUNT; i++) { - fileList.add(createBLOBTempFile(random.nextInt(1024 * 1024)).getAbsolutePath()); + fileList.add(PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(random.nextInt(1024 * 1024)))); } Node testLocalBigFiles = root.addNode("testLocalBigFiles"); @@ -326,7 +325,8 @@ } tempOut.close(); PrivilegedFileHelper.deleteOnExit(testFile); - log.info("Temp file created: " + testFile.getAbsolutePath() + " size: " + PrivilegedFileHelper.length(testFile)); + log.info("Temp file created: " + PrivilegedFileHelper.getAbsolutePath(testFile) + " size: " + + PrivilegedFileHelper.length(testFile)); return testFile; } } 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,7 +21,6 @@ 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; @@ -59,7 +58,7 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); for (int i = 0; i < FILES_COUNT; i++) { 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestMoveBinaryValue1.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,7 +21,6 @@ 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; @@ -57,7 +56,7 @@ startTime = System.currentTimeMillis(); // to get the time of start // 300 Kb - TEST_FILE = createBLOBTempFile(300).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(300)); for (int i = 0; i < FILES_COUNT; i++) { @@ -101,7 +100,7 @@ startTime = System.currentTimeMillis(); // to get the time of start // 45 Kb - TEST_FILE = createBLOBTempFile(45).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(45)); for (int i = 0; i < FILES_COUNT; i++) { 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -22,6 +22,7 @@ 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; @@ -164,7 +165,8 @@ super.setUp(); fails = new ArrayList<String>(); - contentFile = new URL("file:///" + new File("src/test/resources/index/test_index.doc").getAbsolutePath()); + contentFile = + new URL("file:///" + PrivilegedFileHelper.getAbsolutePath(new File("src/test/resources/index/test_index.doc"))); initDB(); } 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestPerformance.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -22,7 +22,6 @@ 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; @@ -432,7 +431,7 @@ // variables for the execution time int FILE_SIZE = 100;// 100 K Node testAddNtFilePlusNtResource = testRoot.addNode("testAddNtFilePlusNtResource", "nt:unstructured"); - TEST_FILE = createBLOBTempFile(FILE_SIZE).getAbsolutePath(); + TEST_FILE = PrivilegedFileHelper.getAbsolutePath(createBLOBTempFile(FILE_SIZE)); long startTime = System.currentTimeMillis(); for (int i = 0; i < NODES_COUNT_SHORT_SESSION; i++) { 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-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -112,7 +112,7 @@ super.setUp(); testRoot = new File("target/fstest"); - testRoot.mkdirs(); + PrivilegedFileHelper.mkdirs(testRoot); PrivilegedFileHelper.deleteOnExit(testRoot); } @@ -121,7 +121,7 @@ { long time = System.currentTimeMillis(); - if (testRoot.exists()) + if (PrivilegedFileHelper.exists(testRoot)) { deleteDir(testRoot); // deleteFiles(files); @@ -143,10 +143,10 @@ protected void deleteFileParent(File fp) { - if (fp.getAbsolutePath().startsWith(testRoot.getAbsolutePath())) + if (PrivilegedFileHelper.getAbsolutePath(fp).startsWith(PrivilegedFileHelper.getAbsolutePath(testRoot))) if (fp.isDirectory()) { - String[] ls = fp.list(); + String[] ls = PrivilegedFileHelper.list(fp); if (ls.length <= 0) { // log.info("del " + fp.getAbsolutePath()); @@ -155,20 +155,20 @@ } } else - fail("Dir can't be a file but found " + fp.getAbsolutePath()); + fail("Dir can't be a file but found " + PrivilegedFileHelper.getAbsolutePath(fp)); } protected void deleteDir(File dir) { - String[] ls = dir.list(); + String[] ls = PrivilegedFileHelper.list(dir); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); - fail("Dir not found " + dir.getAbsolutePath()); + log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); } for (String fn : ls) { - File f = new File(dir.getAbsolutePath() + File.separator + fn); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fn); if (f.isDirectory()) { deleteDir(f); @@ -184,14 +184,14 @@ List<File> files = new ArrayList<File>(); for (int i = 0; i < FILES_COUNT; i++) { - File f = new File(testRoot.getAbsolutePath() + File.separator + SIDGenerator.generate()); + File f = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + SIDGenerator.generate()); try { // f.createNewFile(); FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); try { - fos.write(("File content " + f.getAbsolutePath()).getBytes()); + fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); } finally { @@ -213,16 +213,16 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(testRoot.getAbsolutePath() + buildPathX(fileName)); - dir.mkdirs(); - File f = new File(dir.getAbsolutePath() + File.separator + fileName); + File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + buildPathX(fileName)); + PrivilegedFileHelper.mkdirs(dir); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); try { // f.createNewFile(); FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); try { - fos.write(("File content " + f.getAbsolutePath()).getBytes()); + fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); } finally { @@ -255,16 +255,16 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(testRoot.getAbsolutePath() + buildPathXX(fileName)); - dir.mkdirs(); - File f = new File(dir.getAbsolutePath() + File.separator + fileName); + File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + buildPathXX(fileName)); + PrivilegedFileHelper.mkdirs(dir); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); try { // f.createNewFile(); FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); try { - fos.write(("File content " + f.getAbsolutePath()).getBytes()); + fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); } finally { @@ -301,16 +301,18 @@ 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(testRoot.getAbsolutePath() + File.separator + prefix + File.separator + buildPathX(rnd)); - dir.mkdirs(); - File f = new File(dir.getAbsolutePath() + File.separator + fileName); + 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); try { // f.createNewFile(); FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); try { - fos.write(("File content " + f.getAbsolutePath()).getBytes()); + fos.write(("File content " + PrivilegedFileHelper.getAbsolutePath(f)).getBytes()); } finally { @@ -345,9 +347,9 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = new File(testRoot.getAbsolutePath() + File.separator + buildPathX8(fileName)); - dir.mkdirs(); - File f = new File(dir.getAbsolutePath() + File.separator + fileName); + File dir = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + buildPathX8(fileName)); + PrivilegedFileHelper.mkdirs(dir); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + fileName); try { FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); @@ -379,10 +381,10 @@ // long time = System.currentTimeMillis(); // log.info(">>> Step into directory " + root.getAbsolutePath() + // (filter != null ? ", searched file " + filter.getName() : "")); - String[] ls = filter != null ? root.list(filter) : root.list(); + String[] ls = filter != null ? PrivilegedFileHelper.list(root, filter) : root.list(); for (String file : ls) { - File f = new File(testRoot.getAbsolutePath() + File.separator + file); + File f = new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + file); if (f.isDirectory()) { // dir @@ -417,22 +419,22 @@ protected void readTreeXFiles(File root, NameFilter filter) { - String dirPath = root.getAbsolutePath() + buildPathX(filter.getName()); + String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathX(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? dir.list(filter) : dir.list(); + String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); - fail("Dir not found " + dir.getAbsolutePath()); + log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); } for (String file : ls) { - File f = new File(dir.getAbsolutePath() + File.separator + file); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + f.getAbsolutePath()); + fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); } else { @@ -456,22 +458,22 @@ protected void readTreeX8Files(File root, NameFilter filter) { - String dirPath = root.getAbsolutePath() + buildPathX8(filter.getName()); + String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathX8(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? dir.list(filter) : dir.list(); + String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); - fail("Dir not found " + dir.getAbsolutePath()); + log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); } for (String file : ls) { - File f = new File(dir.getAbsolutePath() + File.separator + file); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + f.getAbsolutePath()); + fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); } else { @@ -500,22 +502,22 @@ protected void readTreeXXFiles(File root, NameFilter filter) { - String dirPath = root.getAbsolutePath() + buildPathXX(filter.getName()); + String dirPath = PrivilegedFileHelper.getAbsolutePath(root) + buildPathXX(filter.getName()); File dir = new File(dirPath); - String[] ls = filter != null ? dir.list(filter) : dir.list(); + String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); - fail("Dir not found " + dir.getAbsolutePath()); + log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); } for (String file : ls) { - File f = new File(dir.getAbsolutePath() + File.separator + file); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + f.getAbsolutePath()); + fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); } else { @@ -547,21 +549,23 @@ 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(testRoot.getAbsolutePath() + File.separator + prefix + File.separator + buildPathX(rnd)); - String[] ls = filter != null ? dir.list(filter) : dir.list(); + File dir = + new File(PrivilegedFileHelper.getAbsolutePath(testRoot) + File.separator + prefix + File.separator + + buildPathX(rnd)); + String[] ls = filter != null ? PrivilegedFileHelper.list(dir, filter) : dir.list(); if (ls == null) { - log.log(Level.WARNING, "Dir not found " + dir.getAbsolutePath()); - fail("Dir not found " + dir.getAbsolutePath()); + log.log(Level.WARNING, "Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); + fail("Dir not found " + PrivilegedFileHelper.getAbsolutePath(dir)); } for (String file : ls) { - File f = new File(dir.getAbsolutePath() + File.separator + file); + File f = new File(PrivilegedFileHelper.getAbsolutePath(dir) + File.separator + file); if (f.isDirectory()) { // dir - fail("The file can't be a dir but found " + f.getAbsolutePath()); + fail("The file can't be a dir but found " + PrivilegedFileHelper.getAbsolutePath(f)); } else { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java 2010-06-14 09:34:01 UTC (rev 2569) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/RemoveVDTest.java 2010-06-14 10:52:13 UTC (rev 2570) @@ -21,20 +21,15 @@ 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.FileCleaner; import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; /** @@ -102,9 +97,8 @@ // Imitation save ((StreamPersistedValueData)vd2).setPersistedFile(((StreamPersistedValueData)vd2).getTempFile()); - assertTrue(vd1.getFile().exists()); - assertTrue(vd2.getFile().exists()); - + assertTrue(PrivilegedFileHelper.exists(vd1.getFile())); + assertTrue(PrivilegedFileHelper.exists(vd2.getFile())); // remove first one vd1 = null; try @@ -116,7 +110,7 @@ // TODO Auto-generated catch block e.printStackTrace(); } - assertTrue(vd2.getFile().exists()); + assertTrue(PrivilegedFileHelper.exists(vd2.getFile())); f.delete(); }

14 years

1
0
0 / 0

exo-jcr SVN: r2569 - kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/secure.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2010-06-14 05:34:01 -0400 (Mon, 14 Jun 2010) New Revision: 2569 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/secure/SecureCollections.java Log: EXOJCR-770 : SecureCollections has a private constructor now, to disallow instantiation. Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/secure/SecureCollections.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/secure/SecureCollections.java 2010-06-14 09:26:11 UTC (rev 2568) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/secure/SecureCollections.java 2010-06-14 09:34:01 UTC (rev 2569) @@ -30,6 +30,13 @@ public class SecureCollections { /** + * Private constructor, used to disallow instance creation + */ + private SecureCollections() + { + } + + /** * Creates {@link SecureSet}, which will require given {@link Permission} for it's modification * * @param <E>

14 years

1
0
0 / 0

exo-jcr SVN: r2568 - jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-06-14 05:26:11 -0400 (Mon, 14 Jun 2010) New Revision: 2568 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java Log: EXOJCR-756: fix Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 09:24:14 UTC (rev 2567) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 09:26:11 UTC (rev 2568) @@ -107,7 +107,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = new File"target/testReadFileValueData"); + File file = new File("target/testReadFileValueData"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file);

14 years

1
0
0 / 0

exo-jcr SVN: r2567 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core and 25 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2010-06-14 05:24:14 -0400 (Mon, 14 Jun 2010) New Revision: 2567 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FilePathHolder.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/SimpleFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.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/directory/DirectoryManagerTest.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/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/security/TestSecurityRepositoryManagment.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/storage/value/fs/CASableFileIOChannelTestBase.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/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/java/TestFileLock.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/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/storage/fs/TestFSReadWrite.java jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java Log: EXOJCR-756: revert file creation via PrivilegedFileHelper Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/config/RepositoryServiceConfigurationImpl.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -170,9 +170,9 @@ else { URL filePath = configurationService.getURL(param.getValue()); - File sourceConfig = PrivilegedFileHelper.file(filePath.toURI()); + File sourceConfig = new File(filePath.toURI()); SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmm"); - File backUp = PrivilegedFileHelper.file(sourceConfig.getAbsoluteFile() + "_" + format.format(new Date())); + File backUp = new File(sourceConfig.getAbsoluteFile() + "_" + format.format(new Date())); if (!sourceConfig.renameTo(backUp)) throw new RepositoryException("Can't back up configuration on path " + sourceConfig.getAbsolutePath()); saveStream = PrivilegedFileHelper.fileOutputStream(sourceConfig); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/BackupWorkspaceInitializer.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -47,7 +47,6 @@ import java.io.Externalizable; import java.io.File; import java.io.FileFilter; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; @@ -100,7 +99,7 @@ else restorePath = fullBackupPath; - this.tempDir = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + this.tempDir = new File(System.getProperty("java.io.tmpdir")); } @Override @@ -286,7 +285,7 @@ { ArrayList<File> list = new ArrayList<File>(); - File rDir = PrivilegedFileHelper.file(restoreDir); + File rDir = new File(restoreDir); Pattern fullBackupPattern = Pattern.compile(".+\\.0"); for (File f : rDir.listFiles(new BackupFilesFilter())) @@ -308,7 +307,7 @@ private String getFullBackupPath() { - File rDir = PrivilegedFileHelper.file(restoreDir); + File rDir = new File(restoreDir); Pattern p = Pattern.compile(".+\\.0"); for (File f : rDir.listFiles(new BackupFilesFilter())) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SysViewWorkspaceInitializer.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -51,7 +51,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -417,7 +416,7 @@ + ") RestoreIntializer should have mandatory parameter " + SysViewWorkspaceInitializer.RESTORE_PATH_PARAMETER); - this.tempDir = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + this.tempDir = new File(System.getProperty("java.io.tmpdir")); } /** @@ -463,7 +462,7 @@ WorkspaceDataContainer.DEF_MAXBUFFERSIZE); this.restorePath = restorePath; - this.tempDir = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + this.tempDir = new File(System.getProperty("java.io.tmpdir")); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -34,7 +34,6 @@ import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.observation.ExtendedEvent; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -118,7 +117,7 @@ public void add(LockData lock) throws LockException { log.debug("add event fire"); - File lockFile = PrivilegedFileHelper.file(rootDir, lock.getNodeIdentifier()); + File lockFile = new File(rootDir, lock.getNodeIdentifier()); if (lockFile.exists()) { @@ -144,7 +143,7 @@ public void remove(LockData lock) throws LockException { log.debug("remove event fire"); - File lockFile = PrivilegedFileHelper.file(rootDir, lock.getNodeIdentifier()); + File lockFile = new File(rootDir, lock.getNodeIdentifier()); if (!lockFile.exists()) { // throw new LockException("Persistent lock information not exists"); @@ -214,7 +213,7 @@ // remove files for (int i = 0; i < list.length; i++) { - File lockFile = PrivilegedFileHelper.file(rootDir, list[i]); + File lockFile = new File(rootDir, list[i]); if (!lockFile.exists()) { log.warn("Persistent lock information for node id " + list[i] + " doesn't exists"); @@ -288,7 +287,7 @@ if (root == null) throw new RepositoryConfigurationException("Repository service configuration." + " Source name (" + PARAM_ROOT_DIR + ") is expected"); - rootDir = PrivilegedFileHelper.file(root); + rootDir = new File(root); if (rootDir.exists()) { if (!rootDir.isDirectory()) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -67,7 +67,6 @@ import java.io.BufferedInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -488,7 +487,7 @@ if (path != null) { - indexDirectory = PrivilegedFileHelper.file(path); + indexDirectory = new File(path); if (!indexDirectory.exists()) { if (!indexDirectory.mkdirs()) @@ -522,7 +521,7 @@ else { // read local namespace mappings - File mapFile = PrivilegedFileHelper.file(indexDirectory, NS_MAPPING_FILE); + File mapFile = new File(indexDirectory, NS_MAPPING_FILE); if (mapFile.exists()) { // be backward compatible and use ns_mappings.properties from @@ -591,7 +590,7 @@ new Integer(getIndexFormatVersion().getVersion())); } - File file = PrivilegedFileHelper.file(indexDirectory, ERROR_LOG); + File file = new File(indexDirectory, ERROR_LOG); errorLog = new ErrorLog(file, errorLogfileSize); // reprocess any notfinished notifies; if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) @@ -1321,14 +1320,14 @@ int lastSeparator = synonymProviderConfigPath.lastIndexOf(separator); if (lastSeparator != -1) { - File root = PrivilegedFileHelper.file(path, synonymProviderConfigPath.substring(0, lastSeparator)); + File root = new File(path, synonymProviderConfigPath.substring(0, lastSeparator)); fsr = - new BufferedInputStream(PrivilegedFileHelper.fileInputStream(PrivilegedFileHelper.file(root, synonymProviderConfigPath + new BufferedInputStream(PrivilegedFileHelper.fileInputStream(new File(root, synonymProviderConfigPath .substring(lastSeparator + 1)))); } else { - fsr = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(PrivilegedFileHelper.file(synonymProviderConfigPath))); + fsr = new BufferedInputStream(PrivilegedFileHelper.fileInputStream(new File(synonymProviderConfigPath))); } synonymProviderConfigFs = fsr; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/value/ValueFactoryImpl.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -30,7 +30,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 org.exoplatform.services.jcr.impl.util.io.WorkspaceFileCleanerHolder; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.log.ExoLogger; @@ -84,7 +83,7 @@ { public Object run() { - tempDirectory = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + tempDirectory = new File(System.getProperty("java.io.tmpdir")); return null; } }; @@ -105,7 +104,7 @@ { public Object run() { - tempDirectory = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + tempDirectory = new File(System.getProperty("java.io.tmpdir")); return null; } }; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -25,7 +25,6 @@ import java.io.Externalizable; import java.io.File; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; @@ -236,7 +235,7 @@ byte[] buf = new byte[size]; in.readFully(buf); - File f = PrivilegedFileHelper.file(new String(buf, "UTF-8")); + File f = new File(new String(buf, "UTF-8")); // validate if exists if (f.exists()) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FilePathHolder.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FilePathHolder.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/FilePathHolder.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.dataflow.serialization; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import java.io.File; import java.util.ArrayList; @@ -86,7 +85,7 @@ List<String> ls = new ArrayList<String>(filePathMap.values()); for (String fPath : ls) - cleaner.addFile(PrivilegedFileHelper.file(fPath)); + cleaner.addFile(new File(fPath)); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/serialization/PersistedValueDataReader.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -87,7 +87,7 @@ */ public AbstractPersistedValueData read(ObjectReader in) throws UnknownClassIdException, IOException { - File tempDirectory = PrivilegedFileHelper.file(SerializationConstants.TEMP_DIR); + File tempDirectory = new File(SerializationConstants.TEMP_DIR); tempDirectory.mkdirs(); // read id Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -34,7 +34,6 @@ import org.exoplatform.services.jcr.impl.storage.jdbc.statistics.StatisticsJDBCStorageConnection; import org.exoplatform.services.jcr.impl.storage.jdbc.update.StorageUpdateManager; 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.jdbc.DBInitializerException; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; @@ -382,11 +381,11 @@ try { String sdParam = wsConfig.getContainer().getParameterValue(SWAPDIR_PROP); - this.swapDirectory = PrivilegedFileHelper.file(sdParam); + this.swapDirectory = new File(sdParam); } catch (RepositoryConfigurationException e1) { - this.swapDirectory = PrivilegedFileHelper.file(DEF_SWAPDIR); + this.swapDirectory = new File(DEF_SWAPDIR); } if (!swapDirectory.exists()) swapDirectory.mkdirs(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableIOSupport.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -18,7 +18,6 @@ */ package org.exoplatform.services.jcr.impl.storage.value.fs; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -89,6 +88,6 @@ public File getFile(String hash) { // work with digest - return PrivilegedFileHelper.file(channel.rootDir, channel.makeFilePath(hash, 0)); + return new File(channel.rootDir, channel.makeFilePath(hash, 0)); } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileIOChannel.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -25,7 +25,6 @@ import org.exoplatform.services.jcr.impl.storage.value.fs.operations.ValueFileIOHelper; import org.exoplatform.services.jcr.impl.storage.value.fs.operations.WriteValue; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.jcr.storage.value.ValueIOChannel; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -96,7 +95,7 @@ this.storageId = storageId; this.resources = resources; - this.tempDir = PrivilegedFileHelper.file(rootDir, FileValueStorage.TEMP_DIR_NAME); + this.tempDir = new File(rootDir, FileValueStorage.TEMP_DIR_NAME); } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/FileValueStorage.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -21,7 +21,6 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; 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 org.exoplatform.services.jcr.storage.WorkspaceStorageConnection; import org.exoplatform.services.jcr.storage.value.ValueStoragePlugin; import org.exoplatform.services.log.ExoLogger; @@ -106,7 +105,7 @@ */ protected void prepareRootDir(String rootDirPath) throws IOException, RepositoryConfigurationException { - this.rootDir = PrivilegedFileHelper.file(rootDirPath); + this.rootDir = new File(rootDirPath); if (!rootDir.exists()) { @@ -115,7 +114,7 @@ log.info("Directory created: " + rootDir.getAbsolutePath()); // create internal temp dir - File tempDir = PrivilegedFileHelper.file(rootDir, TEMP_DIR_NAME); + File tempDir = new File(rootDir, TEMP_DIR_NAME); tempDir.mkdirs(); if (tempDir.exists() && tempDir.isDirectory()) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/SimpleFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/SimpleFileIOChannel.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/SimpleFileIOChannel.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -20,7 +20,6 @@ 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.FileFilter; @@ -66,7 +65,7 @@ @Override protected File getFile(String propertyId, int orderNumber) throws IOException { - return PrivilegedFileHelper.file(rootDir, makeFilePath(propertyId, orderNumber)); + return new File(rootDir, makeFilePath(propertyId, orderNumber)); } @Override Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFile.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.impl.storage.value.fs; import org.exoplatform.services.jcr.impl.util.io.FileCleaner; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -63,7 +62,7 @@ { boolean res = deleteFromSuper(); if (res) - deleteParent(PrivilegedFileHelper.file(getParent())); + deleteParent(new File(getParent())); return res; } @@ -84,7 +83,7 @@ { if (res = fp.delete()) { - res = deleteParent(PrivilegedFileHelper.file(fp.getParent())); + res = deleteParent(new File(fp.getParent())); } else { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/TreeFileIOChannel.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -66,7 +66,7 @@ @Override protected File[] getFiles(final String propertyId) throws IOException { - final File dir = PrivilegedFileHelper.file(PrivilegedFileHelper.getAbsolutePath(rootDir) + buildPath(propertyId)); + final File dir = new File(PrivilegedFileHelper.getAbsolutePath(rootDir) + buildPath(propertyId)); String[] fileNames = PrivilegedFileHelper.list(dir); File[] files = new File[fileNames.length]; for (int i = 0; i < fileNames.length; i++) Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/CASableWriteValue.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -120,7 +120,7 @@ // write calc digest hash // we need hash at first to know do we have to store file or just use one // existing (with same hash) - File temp = PrivilegedFileHelper.file(tempDir, IdGenerator.generate() + "-" + propertyId + orderNumb + TEMP_FILE_EXTENSION); + File temp = new File(tempDir, IdGenerator.generate() + "-" + propertyId + orderNumb + TEMP_FILE_EXTENSION); FileDigestOutputStream out = cas.openFile(temp); try { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/ValueFileOperation.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -130,7 +130,7 @@ public Object run() throws Exception { // lock file in temp directory - lockFile = PrivilegedFileHelper.file(tempDir, targetFile.getName() + LOCK_FILE_EXTENSION); + lockFile = new File(tempDir, targetFile.getName() + LOCK_FILE_EXTENSION); FileOutputStream lout = PrivilegedFileHelper.fileOutputStream(lockFile, true); lout.write(operationInfo.getBytes()); // TODO write info Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedFileHelper.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -23,7 +23,6 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.net.URI; import java.security.AccessController; import java.security.PrivilegedAction; import java.security.PrivilegedActionException; @@ -351,54 +350,6 @@ return AccessController.doPrivileged(action); } - public static File file(final String pathname) - { - PrivilegedAction<File> action = new PrivilegedAction<File>() - { - public File run() - { - return new File(pathname); - } - }; - return AccessController.doPrivileged(action); - } - - public static File file(final URI uri) - { - PrivilegedAction<File> action = new PrivilegedAction<File>() - { - public File run() - { - return new File(uri); - } - }; - return AccessController.doPrivileged(action); - } - - public static File file(final String parent, final String child) - { - PrivilegedAction<File> action = new PrivilegedAction<File>() - { - public File run() - { - return new File(parent, child); - } - }; - return AccessController.doPrivileged(action); - } - - public static File file(final File parent, final String child) - { - PrivilegedAction<File> action = new PrivilegedAction<File>() - { - public File run() - { - return new File(parent, child); - } - }; - return AccessController.doPrivileged(action); - } - public static String[] list(final File file) { PrivilegedAction<String[]> action = new PrivilegedAction<String[]>() Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/statistics/JCRStatisticsManager.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -148,8 +148,8 @@ try { file = - PrivilegedFileHelper.file(System.getProperty("user.dir"), "Statistics" + category + "-" - + System.currentTimeMillis() + ".csv"); + new File(System.getProperty("user.dir"), "Statistics" + category + "-" + System.currentTimeMillis() + + ".csv"); file.createNewFile(); pw = new PrintWriter(file); } @@ -159,7 +159,8 @@ + " in the user directory, we will try to create it in the temp directory", e); try { - file = PrivilegedFileHelper.createTempFile("Statistics" + category, "-" + System.currentTimeMillis() + ".csv"); + file = + PrivilegedFileHelper.createTempFile("Statistics" + category, "-" + System.currentTimeMillis() + ".csv"); pw = new PrintWriter(file); } catch (IOException e1) 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/TextExtractorTest.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -18,14 +18,14 @@ import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; -import javax.jcr.Node; +import java.io.BufferedInputStream; 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. @@ -39,7 +39,7 @@ public void testImport() throws Exception { - File sourceFolder = PrivilegedFileHelper.file(TEST_FOLDER); + File sourceFolder = new File(TEST_FOLDER); // only run if there is test data if (!sourceFolder.exists()) { @@ -60,7 +60,7 @@ String[] names = folder.list(); for (int i = 0; i < names.length; i++) { - File f = PrivilegedFileHelper.file(folder, names[i]); + File f = new File(folder, names[i]); if (f.canRead()) { if (f.isDirectory()) @@ -88,7 +88,7 @@ */ public void testRepeatedUpdate() throws Exception { - File testFile = PrivilegedFileHelper.file("test.pdf"); + File testFile = new File("test.pdf"); if (!testFile.exists()) { return; 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/lucene/directory/DirectoryManagerTest.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -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; @@ -48,15 +47,14 @@ static { - INDEX.setPath(PrivilegedFileHelper.file(PrivilegedFileHelper.file("target"), "directory-factory-test") - .getAbsolutePath()); + INDEX.setPath(new File(new File("target"), "directory-factory-test").getAbsolutePath()); } @Override protected void tearDown() throws Exception { - PrivilegedFileHelper.file(INDEX.getPath(), TEST).delete(); - PrivilegedFileHelper.file(INDEX.getPath(), RENAMED).delete(); + new File(INDEX.getPath(), TEST).delete(); + new File(INDEX.getPath(), RENAMED).delete(); } public void testHasDirectory() throws Exception 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestRestoreWorkspaceInitializer.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -23,7 +23,6 @@ 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; @@ -71,9 +70,9 @@ root.save(); is.close(); - f.renameTo(PrivilegedFileHelper.file("./sv_export_binary.bin")); + f.renameTo(new File("./sv_export_binary.bin")); - File outf = PrivilegedFileHelper.file("./sv_export_root.xml"); + File outf = new File("./sv_export_root.xml"); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(outf); session.exportWorkspaceSystemView(out, false, false); out.close(); @@ -120,8 +119,8 @@ p = multiv.getProperty("exojcrtest:multiValuedName"); p.getValues(); - compareStream(PrivilegedFileHelper.fileInputStream("./sv_export_binary.bin"), root.getNode("binaryTest").getProperty("blob") - .getStream()); + compareStream(PrivilegedFileHelper.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/query/TestArabicSearch.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -49,7 +49,7 @@ public void testSearchWithEncodingParameter() throws Exception { - File file = PrivilegedFileHelper.file("src/test/resources/ArabicUTF8.txt"); + File file = new File("src/test/resources/ArabicUTF8.txt"); assertTrue("/test/resources/ArabicUTF8.txt not found", file.exists()); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -48,7 +48,7 @@ public void testSearchDate() throws Exception { - File file = PrivilegedFileHelper.file("src/test/resources/test.xls"); + File file = new File("src/test/resources/test.xls"); assertTrue("/test/resources/test.xls not found", file.exists()); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestErrorMultithreading.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -19,7 +19,6 @@ import org.exoplatform.services.jcr.core.CredentialsImpl; 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.IdGenerator; @@ -76,7 +75,7 @@ public Session sess; - File file = PrivilegedFileHelper.file("src/test/resources/LARGE.txt"); + File file = new File("src/test/resources/LARGE.txt"); public FileInputStream fis = null; 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -45,7 +45,7 @@ public void testFindFileContent() throws Exception { - File file = PrivilegedFileHelper.file("src/test/resources/test.xls"); + File file = new File("src/test/resources/test.xls"); assertTrue("/test/resources/book.xls not found", file.exists()); FileInputStream fis = PrivilegedFileHelper.fileInputStream(file); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/security/TestSecurityRepositoryManagment.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -23,6 +23,7 @@ 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; @@ -34,7 +35,7 @@ { private static String testWorkspaceName = "testWorkspace"; - public void testGetSystemSessionSuccess() + public void testGetSystemSessionSuccess() throws FileNotFoundException { PrivilegedExceptionAction<Object> action = new PrivilegedExceptionAction<Object>() { Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/dataflow/persistent/TestCleanableFileStreamValueData.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -46,9 +46,9 @@ private static final String FILE_NAME = "testFileCleaned"; - private File parentDir = PrivilegedFileHelper.file("./target"); + private File parentDir = new File("./target"); - private File testFile = PrivilegedFileHelper.file(parentDir, FILE_NAME); + private File testFile = new File(parentDir, FILE_NAME); private FileCleaner testCleaner; Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/CASableFileIOChannelTestBase.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -31,7 +31,6 @@ import org.exoplatform.services.log.Log; import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; /** @@ -70,10 +69,10 @@ if (rootDir == null) { - rootDir = PrivilegedFileHelper.file("target/temp/values-test"); + rootDir = new File("target/temp/values-test"); rootDir.mkdirs(); - PrivilegedFileHelper.file(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); + new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); if (!rootDir.exists()) throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); @@ -117,8 +116,7 @@ fch.commit(); File vsfile = - PrivilegedFileHelper.file(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), - CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum + new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum // =0 assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); @@ -239,8 +237,7 @@ fch.commit(); File vsfile = - PrivilegedFileHelper.file(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), - CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum + new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 0), CASableIOSupport.HASHFILE_ORDERNUMBER)); // orderNum // =0 fch.delete(propertyId); @@ -324,8 +321,7 @@ fch.commit(); File vsfile = - PrivilegedFileHelper.file(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), - CASableIOSupport.HASHFILE_ORDERNUMBER)); + new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); assertEquals("Storage size must be increased on size of ONE file ", initialSize @@ -355,8 +351,7 @@ fch.commit(); File vsfile = - PrivilegedFileHelper.file(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), - CASableIOSupport.HASHFILE_ORDERNUMBER)); + new File(rootDir, fch.makeFilePath(vcas.getIdentifier(propertyId, 15), CASableIOSupport.HASHFILE_ORDERNUMBER)); assertTrue("File should exists " + vsfile.getAbsolutePath(), vsfile.exists()); assertEquals("Storage size must be increased on size of ALL files ", initialSize + addedSize, Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileIOChannel.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -27,7 +27,6 @@ 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,10 +57,10 @@ { super.setUp(); - rootDir = PrivilegedFileHelper.file(PrivilegedFileHelper.file("target"), "vs1"); + rootDir = new File(new File("target"), "vs1"); rootDir.mkdirs(); - PrivilegedFileHelper.file(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); + new File(rootDir, FileValueStorage.TEMP_DIR_NAME).mkdirs(); if (!rootDir.exists()) throw new Exception("Folder does not exist " + rootDir.getAbsolutePath()); @@ -72,7 +71,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file(rootDir, "testReadFromIOChannel0"); + File file = new File(rootDir, "testReadFromIOChannel0"); PrivilegedFileHelper.deleteOnExit(file); if (file.exists()) file.delete(); @@ -82,7 +81,7 @@ buf = "01234567890123456789".getBytes(); - file = PrivilegedFileHelper.file(rootDir, "testReadFromIOChannel1"); + file = new File(rootDir, "testReadFromIOChannel1"); if (file.exists()) file.delete(); out = PrivilegedFileHelper.fileOutputStream(file); @@ -136,11 +135,11 @@ } channel.commit(); - assertTrue(PrivilegedFileHelper.file(rootDir, "testWriteToIOChannel0").exists()); - assertTrue(PrivilegedFileHelper.file(rootDir, "testWriteToIOChannel1").exists()); - assertTrue(PrivilegedFileHelper.file(rootDir, "testWriteToIOChannel2").exists()); + assertTrue(new File(rootDir, "testWriteToIOChannel0").exists()); + assertTrue(new File(rootDir, "testWriteToIOChannel1").exists()); + assertTrue(new File(rootDir, "testWriteToIOChannel2").exists()); - assertEquals(10, PrivilegedFileHelper.length(PrivilegedFileHelper.file(rootDir, "testWriteToIOChannel0"))); + assertEquals(10, PrivilegedFileHelper.length(new File(rootDir, "testWriteToIOChannel0"))); channel.delete("testWriteToIOChannel"); channel.commit(); @@ -199,16 +198,16 @@ } channel.commit(); - assertTrue(PrivilegedFileHelper.file(rootDir, "testDeleteFromIOChannel0").exists()); - assertTrue(PrivilegedFileHelper.file(rootDir, "testDeleteFromIOChannel1").exists()); - assertTrue(PrivilegedFileHelper.file(rootDir, "testDeleteFromIOChannel2").exists()); + 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.file(rootDir, "testDeleteFromIOChannel0").exists()); - assertFalse(PrivilegedFileHelper.file(rootDir, "testDeleteFromIOChannel1").exists()); - assertFalse(PrivilegedFileHelper.file(rootDir, "testDeleteFromIOChannel2").exists()); + assertFalse(new File(rootDir, "testDeleteFromIOChannel0").exists()); + assertFalse(new File(rootDir, "testDeleteFromIOChannel1").exists()); + assertFalse(new File(rootDir, "testDeleteFromIOChannel2").exists()); channel.delete("testDeleteFromIOChannel"); channel.commit(); @@ -237,7 +236,7 @@ } channel.commit(); - File f = PrivilegedFileHelper.file(rootDir, "testConcurrentReadFromIOChannel0"); + File f = new File(rootDir, "testConcurrentReadFromIOChannel0"); if (!f.exists()) throw new Exception("File does not exist " + f.getAbsolutePath()); @@ -283,7 +282,7 @@ } channel.commit(); - File f = PrivilegedFileHelper.file(rootDir, "testDeleteLockedFileFromIOChannel0"); + File f = new File(rootDir, "testDeleteLockedFileFromIOChannel0"); Probe p = new Probe(f); p.start(); @@ -295,7 +294,7 @@ // removed by FileCleaner //Thread.sleep(3000); - f = PrivilegedFileHelper.file(rootDir, "testDeleteLockedFileFromIOChannel0"); + f = new File(rootDir, "testDeleteLockedFileFromIOChannel0"); // assertFalse(f.exists()); System.out.println(">>>>>>>>>>>>>" + f.canRead() + " " + f.exists() + " " + f.canWrite()); System.out.println(">>>>>>>>>>>>>" + PrivilegedFileHelper.fileInputStream(f).read()); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/TestFileValueIO.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -85,7 +85,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testReadByteArrayValueData"); + File file = new File("target/testReadByteArrayValueData"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); @@ -107,7 +107,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testReadFileValueData"); + File file = new File"target/testReadFileValueData"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); @@ -136,7 +136,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testWriteFileValueData"); + File file = new File("target/testWriteFileValueData"); if (file.exists()) file.delete(); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/storage/value/fs/operations/TestValueFileIOHelper.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -123,7 +123,7 @@ out.close(); } - testDir = PrivilegedFileHelper.file("target/TestValueFileIOHelper"); + testDir = new File("target/TestValueFileIOHelper"); testDir.mkdirs(); dest = PrivilegedFileHelper.createTempFile("vdftest", "", testDir); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestPersistedValueData.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -58,7 +58,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testCreateFileStreamValueData"); + File file = new File("target/testCreateFileStreamValueData"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); @@ -84,7 +84,7 @@ { byte[] buf = "0123456789".getBytes(); - SwapFile file = SwapFile.get(PrivilegedFileHelper.file("target"), "testIfFinalizeRemovesTempFileStreamValueData"); + SwapFile file = SwapFile.get(new File("target"), "testIfFinalizeRemovesTempFileStreamValueData"); //File file = PrivilegedFileHelper.file("target/testIfFinalizeRemovesTempFileStreamValueData"); //if (file.exists()) // file.delete(); @@ -111,7 +111,7 @@ byte[] buf = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789" .getBytes(); - File file = PrivilegedFileHelper.file("target/testConcurrentFileStreamValueDataReading"); + File file = new File("target/testConcurrentFileStreamValueDataReading"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueData.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -69,7 +69,7 @@ { byte[] buf = "0123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testCreateFileStreamTransientValueData"); + File file = new File("target/testCreateFileStreamTransientValueData"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); @@ -78,7 +78,7 @@ FileInputStream fs1 = PrivilegedFileHelper.fileInputStream(file); TransientValueData vd = - new TransientValueData(0, null, fs1, null, new FileCleaner(), 5, PrivilegedFileHelper.file("target"), true); + new TransientValueData(0, null, fs1, null, new FileCleaner(), 5, new File("target"), true); // spool to file InputStream fs2 = vd.getAsStream(); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestTransientValueDataSpooling.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -32,8 +32,6 @@ 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; @@ -54,7 +52,7 @@ private TransactionChangesLog cLog; - private final File tmpdir = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + private final File tmpdir = new File(System.getProperty("java.io.tmpdir")); private boolean haveValueStorage = false; Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/value/TestValueImpl.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -45,7 +45,7 @@ public class TestValueImpl extends TestCase { - private File tempDirectory = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir")); + private File tempDirectory = new File(System.getProperty("java.io.tmpdir")); private int maxFufferSize = 10; @@ -53,7 +53,7 @@ { byte[] buf = "012345678901234567890123456789".getBytes(); - File file = PrivilegedFileHelper.file("target/testNewBinaryValue"); + File file = new File("target/testNewBinaryValue"); if (file.exists()) file.delete(); FileOutputStream out = PrivilegedFileHelper.fileOutputStream(file); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/java/TestFileLock.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -18,10 +18,10 @@ */ package org.exoplatform.services.jcr.lab.java; +import junit.framework.TestCase; + import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; -import junit.framework.TestCase; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -45,7 +45,7 @@ public void _testSameJVMlLock() throws IOException, InterruptedException { - File f = PrivilegedFileHelper.file("\\\\storm\\public\\file1.tmp"); + File f = new File("\\\\storm\\public\\file1.tmp"); f.createNewFile(); FileOutputStream fout = PrivilegedFileHelper.fileOutputStream(f); FileChannel fc = fout.getChannel(); @@ -82,7 +82,7 @@ try { Thread.sleep(25); - FileOutputStream fout1 = PrivilegedFileHelper.fileOutputStream(PrivilegedFileHelper.file("\\\\storm\\public\\file1.tmp")); + FileOutputStream fout1 = PrivilegedFileHelper.fileOutputStream(new File("\\\\storm\\public\\file1.tmp")); FileChannel fc1 = fout1.getChannel(); try { @@ -135,7 +135,7 @@ final long timeout = Long.valueOf(System.getProperty("exo.jcr.lab.testFileLockTimeout", "20000")); // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file2.tmp"); - File f = PrivilegedFileHelper.file("D:\\tmp\\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); @@ -218,7 +218,7 @@ final long timeout = Long.valueOf(System.getProperty("exo.jcr.lab.testFileLockTimeout", "20000")); // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file3.tmp"); - File f = PrivilegedFileHelper.file("D:\\tmp\\file3.tmp"); + File f = new File("D:\\tmp\\file3.tmp"); // write new content System.out.println("Try open file for write " + System.currentTimeMillis()); @@ -263,7 +263,7 @@ { // File f = PrivilegedFileHelper.file("\\\\storm\\public\\file3.tmp"); - File f = PrivilegedFileHelper.file("D:\\tmp\\file4.tmp"); + File f = new File("D:\\tmp\\file4.tmp"); // write new content System.out.println("Try open file for read " + System.currentTimeMillis()); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/blob/TestLoadRepo.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -28,8 +28,6 @@ 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; @@ -60,7 +58,7 @@ public void _testExport() throws Exception { Node testNode = root.addNode("testNode"); - File checkSummValue = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir"), "repo.ssh1"); + File checkSummValue = new File(System.getProperty("java.io.tmpdir"), "repo.ssh1"); BufferedOutputStream sshStrream = new BufferedOutputStream(PrivilegedFileHelper.fileOutputStream(checkSummValue)); RandomValueNodeGenerator nodeGenerator = new RandomValueNodeGenerator(session.getValueFactory(), 6, 5, 8, 5, 1024 * 1024); @@ -70,7 +68,7 @@ ValueSsh1Generator ssh1Generator = new ValueSsh1Generator(session.getTransientNodesManager(), sshStrream); ((NodeImpl)testNode).getData().accept(ssh1Generator); sshStrream.close(); - File exportFile = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir"), "testExport.xml"); + File exportFile = new File(System.getProperty("java.io.tmpdir"), "testExport.xml"); OutputStream os = PrivilegedFileHelper.fileOutputStream(exportFile); session.exportSystemView(testNode.getPath(), os, false, false); os.close(); @@ -85,7 +83,7 @@ ConstraintViolationException, LockException, RepositoryException, IOException, NoSuchAlgorithmException { - File importFile = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir"), "testExport.xml"); + File importFile = new File(System.getProperty("java.io.tmpdir"), "testExport.xml"); InputStream is = PrivilegedFileHelper.fileInputStream(importFile); session.getWorkspace().getNamespaceRegistry().registerNamespace("exojcrtest_old", @@ -93,7 +91,7 @@ session.importXML(root.getPath(), is, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING); session.save(); - File ssh1File = PrivilegedFileHelper.file(System.getProperty("java.io.tmpdir"), "repo.ssh1"); + File ssh1File = new File(System.getProperty("java.io.tmpdir"), "repo.ssh1"); InputStream isSSH1 = PrivilegedFileHelper.fileInputStream(ssh1File); ValueSsh1Comparator ssh1Comparator = new ValueSsh1Comparator(session.getTransientNodesManager(), isSSH1); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/dataflow/persistent/TestGetNodesConcurrentModification.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -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.file("src/test/resources/index/test_index.doc").getAbsolutePath()); + 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/perf/TestBulkItemsAdd.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -18,6 +18,8 @@ */ 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; @@ -25,9 +27,6 @@ import javax.jcr.Node; -import org.exoplatform.services.jcr.JcrAPIBaseTest; -import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper; - /** * Created by The eXo Platform SAS Author : Peter Nedonosko peter.nedonosko(a)exoplatform.com.ua * 20.07.2006 @@ -75,7 +74,7 @@ log.info("Nodes saved " + nodesCount + ", " + (System.currentTimeMillis() - startTime) + "ms"); // save stats - PrintWriter statFile = new PrintWriter(PrivilegedFileHelper.file("stats.txt")); + PrintWriter statFile = new PrintWriter(new File("stats.txt")); statFile.write(stats.toString()); statFile.close(); 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/load/storage/fs/TestFSReadWrite.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -111,7 +111,7 @@ { super.setUp(); - testRoot = PrivilegedFileHelper.file("target/fstest"); + testRoot = new File("target/fstest"); testRoot.mkdirs(); PrivilegedFileHelper.deleteOnExit(testRoot); } @@ -137,7 +137,7 @@ for (File f : filesList) { f.delete(); - deleteFileParent(PrivilegedFileHelper.file(f.getParent())); + deleteFileParent(new File(f.getParent())); } } @@ -151,7 +151,7 @@ { // log.info("del " + fp.getAbsolutePath()); fp.delete(); - deleteFileParent(PrivilegedFileHelper.file(fp.getParent())); + deleteFileParent(new File(fp.getParent())); } } else @@ -168,7 +168,7 @@ } for (String fn : ls) { - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + fn); + File f = new File(dir.getAbsolutePath() + File.separator + fn); if (f.isDirectory()) { deleteDir(f); @@ -184,7 +184,7 @@ List<File> files = new ArrayList<File>(); for (int i = 0; i < FILES_COUNT; i++) { - File f = PrivilegedFileHelper.file(testRoot.getAbsolutePath() + File.separator + SIDGenerator.generate()); + File f = new File(testRoot.getAbsolutePath() + File.separator + SIDGenerator.generate()); try { // f.createNewFile(); @@ -213,9 +213,9 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = PrivilegedFileHelper.file(testRoot.getAbsolutePath() + buildPathX(fileName)); + File dir = new File(testRoot.getAbsolutePath() + buildPathX(fileName)); dir.mkdirs(); - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + fileName); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); @@ -255,9 +255,9 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = PrivilegedFileHelper.file(testRoot.getAbsolutePath() + buildPathXX(fileName)); + File dir = new File(testRoot.getAbsolutePath() + buildPathXX(fileName)); dir.mkdirs(); - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + fileName); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); @@ -301,11 +301,9 @@ String fileName = SIDGenerator.generate(); String prefix = fileName.substring(0, 24); // time + addr hash prefix String rnd = fileName.substring(24); // random name - File dir = - PrivilegedFileHelper.file(testRoot.getAbsolutePath() + File.separator + prefix + File.separator - + buildPathX(rnd)); + File dir = new File(testRoot.getAbsolutePath() + File.separator + prefix + File.separator + buildPathX(rnd)); dir.mkdirs(); - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + fileName); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { // f.createNewFile(); @@ -347,9 +345,9 @@ for (int i = 0; i < FILES_COUNT; i++) { String fileName = SIDGenerator.generate(); - File dir = PrivilegedFileHelper.file(testRoot.getAbsolutePath() + File.separator + buildPathX8(fileName)); + File dir = new File(testRoot.getAbsolutePath() + File.separator + buildPathX8(fileName)); dir.mkdirs(); - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + fileName); + File f = new File(dir.getAbsolutePath() + File.separator + fileName); try { FileOutputStream fos = PrivilegedFileHelper.fileOutputStream(f); @@ -384,7 +382,7 @@ String[] ls = filter != null ? root.list(filter) : root.list(); for (String file : ls) { - File f = PrivilegedFileHelper.file(testRoot.getAbsolutePath() + File.separator + file); + File f = new File(testRoot.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir @@ -420,7 +418,7 @@ protected void readTreeXFiles(File root, NameFilter filter) { String dirPath = root.getAbsolutePath() + buildPathX(filter.getName()); - File dir = PrivilegedFileHelper.file(dirPath); + File dir = new File(dirPath); String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { @@ -430,7 +428,7 @@ for (String file : ls) { - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir @@ -459,7 +457,7 @@ protected void readTreeX8Files(File root, NameFilter filter) { String dirPath = root.getAbsolutePath() + buildPathX8(filter.getName()); - File dir = PrivilegedFileHelper.file(dirPath); + File dir = new File(dirPath); String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { @@ -469,7 +467,7 @@ for (String file : ls) { - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir @@ -503,7 +501,7 @@ protected void readTreeXXFiles(File root, NameFilter filter) { String dirPath = root.getAbsolutePath() + buildPathXX(filter.getName()); - File dir = PrivilegedFileHelper.file(dirPath); + File dir = new File(dirPath); String[] ls = filter != null ? dir.list(filter) : dir.list(); if (ls == null) { @@ -513,7 +511,7 @@ for (String file : ls) { - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir @@ -549,9 +547,7 @@ String fileName = filter.getName(); String prefix = fileName.substring(0, 24); // time + addr hash prefix String rnd = fileName.substring(24); // random name - File dir = - PrivilegedFileHelper.file(testRoot.getAbsolutePath() + File.separator + prefix + File.separator - + buildPathX(rnd)); + 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) { @@ -561,7 +557,7 @@ for (String file : ls) { - File f = PrivilegedFileHelper.file(dir.getAbsolutePath() + File.separator + file); + File f = new File(dir.getAbsolutePath() + File.separator + file); if (f.isDirectory()) { // dir 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-14 09:00:21 UTC (rev 2566) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2010-06-14 09:24:14 UTC (rev 2567) @@ -31,7 +31,6 @@ 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 +55,7 @@ sessionWS1.save(); // 1-st export - File f1 = PrivilegedFileHelper.file("target/1.xml"); + File f1 = new File("target/1.xml"); sessionWS1.exportWorkspaceSystemView(PrivilegedFileHelper.fileOutputStream(f1), false, false); // 1-st import @@ -77,7 +76,7 @@ { // 2-st export SessionImpl back1 = (SessionImpl)repository.login(credentials, "ws1_restore_1"); - File f2 = PrivilegedFileHelper.file("target/2.xml"); + File f2 = new File("target/2.xml"); back1.exportWorkspaceSystemView(PrivilegedFileHelper.fileOutputStream(f2), false, false); // 2-st import

14 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits June 2010