keycloak-aplcache

Merge pull request #3331 from stianst/KEYCLOAK-3665 KEYCLOAK-3665 …

10/17/2016 2:48:09 PM

Remove theme module and make built-in theme resources r…

Stian Thorgersen

Commit: cefb174

Tree: d119e04

Parents: dc13c70
e61191e

Changes

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml 5(+0 -5)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-themes/main/module.xml 36(+0 -36)

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml 1(+0 -1)

distribution/server-dist/assembly.xml 9(+9 -0)

themes/src/main/resources/theme/base/admin/index.ftl 2(+1 -1)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-mocks.js 2433(+0 -2433)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-scenario.js 40024(+0 -40024)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/angular-translate-storage-cookie.js 71(+0 -71)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter.js 185(+0 -185)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/jstd-scenario-adapter-config.js 6(+0 -6)

themes/src/main/resources/theme/keycloak/common/resources/lib/angular/version.txt 1(+0 -1)

themes/src/main/resources/theme/keycloak/common/resources/lib/components/font-awesome/fonts/FontAwesome.otf 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload.js 156(+0 -156)

themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-html5-shim.js 25(+0 -25)

themes/src/main/resources/theme/keycloak/common/resources/lib/fileupload/angular-file-upload-shim.js 215(+0 -215)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/css/patternfly.min.css 10(+0 -10)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.png 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand.svg 87(+0 -87)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/brand-lg.png 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/favicon.ico 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.png 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/img/logo.svg 22(+0 -22)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.js 212(+0 -212)

themes/src/main/resources/theme/keycloak/common/resources/lib/patternfly/js/patternfly.min.js 1(+0 -1)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/component.json 8(+0 -8)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/LICENSE 18(+0 -18)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/README.md 83(+0 -83)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/release.sh 69(+0 -69)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.jquery.json 36(+0 -36)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2.js 3137(+0 -3137)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ar.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ca.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_cs.js 49(+0 -49)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_da.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_de.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_el.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_en.js.template 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_es.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_et.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_eu.js 43(+0 -43)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fi.js 28(+0 -28)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_fr.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_gl.js 43(+0 -43)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_he.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hr.js 42(+0 -42)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_hu.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_id.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_is.js 16(+0 -16)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_it.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ja.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ko.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lt.js 29(+0 -29)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_lv.js 16(+0 -16)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_mk.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_nl.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_no.js 18(+0 -18)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pl.js 37(+0 -37)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-BR.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_pt-PT.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ro.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ru.js 15(+0 -15)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sk.js 48(+0 -48)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_sv.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_tr.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_ua.js 17(+0 -17)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_vi.js 18(+0 -18)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-CN.js 14(+0 -14)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2_locale_zh-TW.js 14(+0 -14)

themes/src/main/resources/theme/keycloak/common/resources/lib/select2-3.4.1/select2x2.png 0(+0 -0)

themes/src/main/resources/theme/keycloak/common/resources/lib/ui-ace/LICENSE 24(+0 -24)

themes/src/main/resources/theme/keycloak/common/resources/lib/ui-ace/README.md 21(+0 -21)

Details

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml 5(+0 -5)

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
index 8cf1cde..4f351fd 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
@@ -27,11 +27,6 @@
     <dependencies>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" services="import"/>
-        <module name="org.keycloak.keycloak-themes">
-            <imports>
-                <include path="META-INF"/>
-            </imports>
-        </module>
         <module name="org.keycloak.keycloak-js-adapter" services="import"/>
         <module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
         <module name="org.keycloak.keycloak-ldap-federation" services="import"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml 1(+0 -1)

diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml
index 3f0470c..d785cb7 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml
@@ -29,7 +29,6 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-services"/>
-        <module name="org.keycloak.keycloak-themes"/>
         <module name="org.jboss.modules"/>
     </dependencies>
 </module>

distribution/server-dist/assembly.xml 9(+9 -0)

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 9e24567..0e58c83 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -46,6 +46,7 @@
                 <exclude>appclient/**</exclude>
                 <exclude>copyright.txt</exclude>
                 <exclude>README.txt</exclude>
+                <exclude>themes/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>
@@ -57,6 +58,14 @@
             <fileMode>0755</fileMode>
         </fileSet>
         <fileSet>
+            <directory>target/${project.build.finalName}</directory>
+            <outputDirectory/>
+            <includes>
+                <include>themes/**</include>
+            </includes>
+            <fileMode>0444</fileMode>
+        </fileSet>
+        <fileSet>
             <directory>src/main/welcome-content</directory>
             <outputDirectory>welcome-content</outputDirectory>
             <includes>

themes/src/main/resources/theme/base/admin/index.ftl 2(+1 -1)

diff --git a/themes/src/main/resources/theme/base/admin/index.ftl b/themes/src/main/resources/theme/base/admin/index.ftl
index 76286b1..7ab0bc9 100755
--- a/themes/src/main/resources/theme/base/admin/index.ftl
+++ b/themes/src/main/resources/theme/base/admin/index.ftl
@@ -22,7 +22,7 @@
     </script>
 
     <script src="${resourceUrl}/lib/jquery/jquery-1.10.2.js" type="text/javascript"></script>
-    <script src="${resourceUrl}/lib/select2-3.4.1/select2.js" type="text/javascript"></script>
+    <script src="${resourceUrl}/lib/select2-3.4.1/select2.min.js" type="text/javascript"></script>
 
     <script src="${resourceUrl}/lib/angular/angular.js"></script>
     <script src="${resourceUrl}/lib/angular/angular-resource.js"></script>