keycloak-aplcache

Don't replace welcome-content in server-overlay

4/23/2015 10:44:29 AM

Stian Thorgersen

Commit: 35b6c88

Tree: faa5975

Parents: f74e146

Changes

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

distribution/server-dist/src/main/providers/README.txt 2(+0 -2)

distribution/server-dist/src/main/themes/README.txt 3(+0 -3)

distribution/server-dist/src/main/xslt/standalone.xsl 89(+0 -89)

distribution/server-overlay/assembly.xml 15(+0 -15)

distribution/server-overlay/src/main/welcome-content/index.html 32(+0 -32)

Details

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

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
index 03adcc2..8cbea2d 100755
--- a/distribution/server-dist/assembly.xml
+++ b/distribution/server-dist/assembly.xml
@@ -26,6 +26,13 @@
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>src/main/welcome-content</directory>
+            <outputDirectory>welcome-content</outputDirectory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

distribution/server-overlay/assembly.xml 15(+0 -15)

diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index a85813a..8764a7d 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -20,14 +20,6 @@
             <outputDirectory>docs</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>**/*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-        <fileSet>
             <directory>${project.build.directory}/unpacked/modules</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
         </fileSet>
@@ -39,13 +31,6 @@
             </includes>
         </fileSet>
         <fileSet>
-            <directory>src/main/welcome-content</directory>
-            <outputDirectory>welcome-content</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
             <directory>../../</directory>
             <includes>
                 <include>License.html</include>