keycloak-memoizeit

Merge pull request #624 from patriot1burke/master add js

8/12/2014 7:25:03 PM

Details

diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 049062a..228f0b9 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -54,6 +54,14 @@
             <outputDirectory>keycloak</outputDirectory>
         </fileSet>
         <fileSet>
+            <directory>${project.build.directory}/unpacked/js-adapter</directory>
+            <outputDirectory>adapters/js-adapter</outputDirectory>
+            <includes>
+                <include>**/*.js</include>
+                <include>**/*.html</include>
+            </includes>
+        </fileSet>
+        <fileSet>
             <directory>src/main/welcome-content</directory>
             <outputDirectory>keycloak/welcome-content</outputDirectory>
             <includes>
diff --git a/distribution/appliance-dist/pom.xml b/distribution/appliance-dist/pom.xml
index 7d6d8d0..c6c0085 100755
--- a/distribution/appliance-dist/pom.xml
+++ b/distribution/appliance-dist/pom.xml
@@ -83,6 +83,12 @@
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/unpacked/adapter</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-js-adapter</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                             <excludes>**/welcome-content/*</excludes>
                         </configuration>
diff --git a/distribution/war-dist/assembly.xml b/distribution/war-dist/assembly.xml
index 3438589..7d45e6f 100755
--- a/distribution/war-dist/assembly.xml
+++ b/distribution/war-dist/assembly.xml
@@ -10,6 +10,17 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>**/js-adapter/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/js-adapter</directory>
+            <outputDirectory>adapters/js-adapter</outputDirectory>
+            <includes>
+                <include>**/*.js</include>
+                <include>**/*.html</include>
+            </includes>
         </fileSet>
     </fileSets>
     <dependencySets>
diff --git a/distribution/war-dist/pom.xml b/distribution/war-dist/pom.xml
index 7fc5d92..b8bd0c1 100755
--- a/distribution/war-dist/pom.xml
+++ b/distribution/war-dist/pom.xml
@@ -84,6 +84,12 @@
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-js-adapter</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>