keycloak-uncached

Merge pull request #509 from stianst/master KEYCLOAK-553

7/9/2014 10:17:36 AM

Details

diff --git a/integration/js/pom.xml b/integration/js/pom.xml
index a08f3df..d9958b5 100755
--- a/integration/js/pom.xml
+++ b/integration/js/pom.xml
@@ -17,15 +17,32 @@
 	</dependencies>
 
 	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-                                    <source>${maven.compiler.source}</source>
-                                    <target>${maven.compiler.target}</target>
-				</configuration>
-			</plugin>
+        <plugins>
+            <plugin>
+                <groupId>com.samaxes.maven</groupId>
+                <artifactId>minify-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>min-js</id>
+                        <phase>compile</phase>
+                        <configuration>
+                            <charset>utf-8</charset>
+                            <webappSourceDir>${basedir}/src/main/resources</webappSourceDir>
+                            <jsSourceDir>.</jsSourceDir>
+                            <jsSourceFiles>
+                                <jsSourceFile>keycloak.js</jsSourceFile>
+                            </jsSourceFiles>
+
+                            <webappTargetDir>${project.build.directory}/classes</webappTargetDir>
+                            <jsTargetDir>.</jsTargetDir>
+                            <jsFinalFile>keycloak.js</jsFinalFile>
+                        </configuration>
+                        <goals>
+                            <goal>minify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 

pom.xml 5(+5 -0)

diff --git a/pom.xml b/pom.xml
index a3871e1..0e187f8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -550,6 +550,11 @@
                         <skip>true</skip>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>com.samaxes.maven</groupId>
+                    <artifactId>minify-maven-plugin</artifactId>
+                    <version>1.7.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
 
diff --git a/services/src/main/java/org/keycloak/services/resources/JsResource.java b/services/src/main/java/org/keycloak/services/resources/JsResource.java
index 62349db..ce012e7 100755
--- a/services/src/main/java/org/keycloak/services/resources/JsResource.java
+++ b/services/src/main/java/org/keycloak/services/resources/JsResource.java
@@ -31,4 +31,16 @@ public class JsResource {
         }
     }
 
+    @GET
+    @Path("/keycloak.min.js")
+    @Produces("text/javascript")
+    public Response getMinJs() {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream("keycloak.min.js");
+        if (inputStream != null) {
+            return Response.ok(inputStream).build();
+        } else {
+            return Response.status(Response.Status.NOT_FOUND).build();
+        }
+    }
+
 }