Add FSI and Healthcare themes to archetype and update Easel and WKND themes

src/main/archetype/ui.apps.structure/pom.xml

@@ -42,8 +42,6 @@
                         <filter><root>/apps/fd/af</root></filter>
                         #if ($aemVersion == "cloud")
                         <filter><root>/apps/fd/af/themes</root></filter>
-                        #else
-                        <filter><root>/apps/fd/af/theme-clientlibs</root></filter>
                         #end
                         #end
                         <filter><root>/apps/sling</root></filter>

src/main/archetype/ui.apps/src/main/content/META-INF/vault/filter.xml

@@ -5,10 +5,9 @@
     <filter root="/apps/${appId}/i18n"/>
 #if ( $includeForms == "y" || $includeFormsenrollment == "y" || $includeFormscommunications == "y" || $includeFormsheadless == "y")
 #if ($aemVersion == "cloud")
-    <filter root="/apps/fd/af/themes"/>
-#else
-    <filter root="/apps/fd/af/theme-clientlibs"/>
+    <filter root="/apps/fd/af/themes" mode="merge"/>
 #end
+
 #end
 #if ( $includeErrorHandler == "y" )
     <filter root="/apps/sling" />

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__.adaptiveform.theme.easel/.content.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[${appId}.adaptiveform.theme.easel]"
+    cssProcessor="[default:none,min:none]"
+    jsProcessor="[default:none,min:gcc;compilationLevel=whitespace]"
+    allowProxy="{Boolean}true"
+    formsTheme="true"/>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/adaptiveform.theme.easel/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__.adaptiveform.theme.fsi/.content.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="cq:ClientLibraryFolder"
-    categories="[adaptiveform.theme.easel]"
+    categories="[${appId}.adaptiveform.theme.fsi]"
     cssProcessor="[default:none,min:none]"
     jsProcessor="[default:none,min:gcc;compilationLevel=whitespace]"
     allowProxy="{Boolean}true"

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__.adaptiveform.theme.healthcare/.content.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[${appId}.adaptiveform.theme.healthcare]"
+    cssProcessor="[default:none,min:none]"
+    jsProcessor="[default:none,min:gcc;compilationLevel=whitespace]"
+    allowProxy="{Boolean}true"
+    formsTheme="true"/>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__.adaptiveform.theme.healthcare/css.txt

@@ -0,0 +1,3 @@
+#base=css
+
+theme.css

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__.adaptiveform.theme.healthcare/js.txt

@@ -0,0 +1,3 @@
+#base=js
+
+theme.js