Merge remote-tracking branch 'upstream/master'

core/src/main/java/org/keycloak/Version.java

@@ -12,6 +12,7 @@ import java.util.Properties;
  */
 public class Version {
     public static String VERSION;
+    public static String RESOURCES_VERSION;
     public static String BUILD_TIME;
     public static final String UNKNOWN = "UNKNOWN";
     public static final Version SINGLETON;
@@ -26,6 +27,7 @@ public class Version {
             props.load(is);
             VERSION = props.getProperty("version");
             BUILD_TIME = props.getProperty("build-time");
+            RESOURCES_VERSION = VERSION.toLowerCase();
         } catch (IOException e) {
             VERSION=UNKNOWN;
             BUILD_TIME=UNKNOWN;

core/src/main/java/org/keycloak/util/MimeTypeUtil.java

@@ -0,0 +1,29 @@
+package org.keycloak.util;
+
+import javax.activation.MimetypesFileTypeMap;
+import java.io.File;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class MimeTypeUtil {
+
+    private static MimetypesFileTypeMap map = new MimetypesFileTypeMap();
+    static {
+        map.addMimeTypes("text/css css CSS");
+        map.addMimeTypes("text/javascript js JS");
+        map.addMimeTypes("text/javascript js JS");
+        map.addMimeTypes("image/png png PNG");
+        map.addMimeTypes("image/svg+xml svg SVG");
+        map.addMimeTypes("text/html html htm HTML HTM");
+    }
+
+    public static String getContentType(File file) {
+        return map.getContentType(file);
+    }
+
+    public static String getContentType(String path) {
+        return map.getContentType(path);
+    }
+
+}