Author: aparfonov Date: 2011-04-29 03:48:18 -0400 (Fri, 29 Apr 2011) New Revision: 4329 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java Log: EXOJCR-1325 : make possible to set location of mimetypes properties file via system property org.exoplatform.mimetypes. Context classloader is used for load specified file. Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-04-28 13:23:28 UTC (rev 4328) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/commons/utils/MimeTypeResolver.java 2011-04-29 07:48:18 UTC (rev 4329) @@ -19,6 +19,7 @@ package org.exoplatform.commons.utils; import java.io.IOException; +import java.io.InputStream; import java.security.PrivilegedExceptionAction; import java.util.ArrayList; import java.util.HashMap; @@ -42,7 +43,21 @@ { public Void run() throws Exception { - Scanner scanner = new Scanner(getClass().getResourceAsStream("mimetypes.properties"), "ISO-8859-1"); + Scanner scanner = null; + String mimeTypeProperties = System.getProperty("org.exoplatform.mimetypes"); + if (mimeTypeProperties != null) + { + InputStream stream = + Thread.currentThread().getContextClassLoader().getResourceAsStream(mimeTypeProperties); + if (stream != null) + { + scanner = new Scanner(stream, "ISO-8859-1"); + } + } + if (scanner == null) + { + scanner = new Scanner(getClass().getResourceAsStream("mimetypes.properties"), "ISO-8859-1"); + } try { while (scanner.hasNextLine())