#26957: moving dotcms-webcompnents/dist contents to ROOT (#26979)

dotCMS · Dec 12, 2023 · 25f4e64 · 25f4e64
1 parent 21b5d08
commit 25f4e64
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/dotCMS/src/assembly/descriptor.xml b/dotCMS/src/assembly/descriptor.xml
@@ -67,6 +67,20 @@
             <directory>${docs-directory}</directory>
             <outputDirectory>docs</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${exploded-webapp-dir}</directory>
+            <outputDirectory>dotserver/tomcat-${tomcat.version}/webapps/ROOT</outputDirectory>
+            <excludes>
+                <exclude>**/dotcms-webcomponents/dist/dotcms-webcomponents/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${exploded-webapp-dir}/dotcms-webcomponents/dist</directory>
+            <outputDirectory>dotserver/tomcat-${tomcat.version}/webapps/ROOT</outputDirectory>
+            <includes>
+                <include>**/dotcms-webcomponents/**</include>
+            </includes>
+        </fileSet>
     </fileSets>
     <!--
     <files>

diff --git a/dotCMS/src/main/docker/original/docker-descriptor.xml b/dotCMS/src/main/docker/original/docker-descriptor.xml
@@ -19,7 +19,6 @@
                 <exclude>**/logs/**</exclude>
             </excludes>
         </fileSet>
-
         <fileSet>
             <directory>${assembly-directory}/dotserver/tomcat-${tomcat.version}</directory>
             <outputDirectory>dotserver/tomcat-${tomcat.version}</outputDirectory>
@@ -36,9 +35,18 @@
         <fileSet>
             <directory>${exploded-webapp-dir}</directory>
             <outputDirectory>dotserver/tomcat-${tomcat.version}/webapps/ROOT</outputDirectory>
+            <excludes>
+                <exclude>**/dotcms-webcomponents/dist/dotcms-webcomponents/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${exploded-webapp-dir}/dotcms-webcomponents/dist</directory>
+            <outputDirectory>dotserver/tomcat-${tomcat.version}/webapps/ROOT</outputDirectory>
+            <includes>
+                <include>**/dotcms-webcomponents/**</include>
+            </includes>
         </fileSet>
-    </fileSets>
-
 
+    </fileSets>
 
 </assembly>