keycloak-memoizeit

fix mimetype

4/30/2014 3:24:37 PM

Details

pom.xml 1(+1 -0)

diff --git a/pom.xml b/pom.xml
index 94e25e2..1bde0c2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,7 @@
         <module>server</module>
         <module>timer</module>
         <module>bundled-war-example</module>
+        <!-- <module>project-integrations</module> -->
     </modules>
 
     <dependencyManagement>
diff --git a/services/src/main/java/org/keycloak/services/resources/AdminResource.java b/services/src/main/java/org/keycloak/services/resources/AdminResource.java
index 41960a6..75aae6d 100755
--- a/services/src/main/java/org/keycloak/services/resources/AdminResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/AdminResource.java
@@ -10,6 +10,7 @@ import javax.activation.MimetypesFileTypeMap;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
@@ -47,7 +48,9 @@ public class AdminResource {
             Theme theme = ThemeLoader.createTheme(Config.getThemeAdmin(), Theme.Type.ADMIN);
             InputStream resource = theme.getResourceAsStream(path);
             if (resource != null) {
-                return Response.ok(resource).type(mimeTypes.getContentType(path)).build();
+                String contentType = mimeTypes.getContentType(path);
+                logger.info("contentType: " + contentType);
+                return Response.ok(resource).type(contentType).build();
             } else {
                 return Response.status(Response.Status.NOT_FOUND).build();
             }
diff --git a/services/src/main/resources/META-INF/mime.types b/services/src/main/resources/META-INF/mime.types
old mode 100644
new mode 100755
index 1f77e9d..48af349
--- a/services/src/main/resources/META-INF/mime.types
+++ b/services/src/main/resources/META-INF/mime.types
@@ -1,4 +1,5 @@
 text/css css CSS
 text/javascript js JS
 text/javascript js JS
-image/svg+xml svg SVG
\ No newline at end of file
+image/svg+xml svg SVG
+text/html html htm HTML HTM
\ No newline at end of file