[exo-jcr-commits] exo-jcr SVN: r5425 - kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2012-01-06 04:42:23 -0500 (Fri, 06 Jan 2012)
New Revision: 5425

Modified:
   kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IOUtil.java
   kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PrivilegedFileHelper.java
Log:
EXOJCR-968: Move DBInitalizer and DBCleaner common code into separated class

Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IOUtil.java
===================================================================
--- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IOUtil.java	2012-01-05 10:42:24 UTC (rev 5424)
+++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/IOUtil.java	2012-01-06 09:42:23 UTC (rev 5425)
@@ -68,7 +68,7 @@
       {
          throw new NullPointerException("No null file accepted");
       }
-      FileInputStream is = new FileInputStream(file);
+      FileInputStream is = PrivilegedFileHelper.fileInputStream(file);
       return new String(getStreamContentAsBytes(is), charset);
    }
 
@@ -132,7 +132,7 @@
       {
          throw new NullPointerException("No null file name accepted");
       }
-      FileInputStream is = new FileInputStream(fileName);
+      FileInputStream is = PrivilegedFileHelper.fileInputStream(fileName);
       return getStreamContentAsBytes(is);
    }
 

Modified: kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PrivilegedFileHelper.java
===================================================================
--- kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PrivilegedFileHelper.java	2012-01-05 10:42:24 UTC (rev 5424)
+++ kernel/branches/2.4.x/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/PrivilegedFileHelper.java	2012-01-06 09:42:23 UTC (rev 5425)
@@ -25,6 +25,7 @@
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -42,6 +43,22 @@
 {
 
    /**
+    * getResourceAsStream in privileged mode.
+    */
+   public static InputStream getResourceAsStream(final String resource) throws FileNotFoundException
+   {
+      PrivilegedAction<InputStream> action = new PrivilegedAction<InputStream>()
+      {
+         public InputStream run()
+         {
+            return PrivilegedFileHelper.class.getClass().getResourceAsStream(resource);
+         }
+      };
+
+      return SecurityHelper.doPrivilegedAction(action);
+   }
+
+   /**
     * Create FileOutputStream in privileged mode.
     * 
     * @param file