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

…themes

Adding appId in theme paths, title and category name.
Adding entries for new templates to post genrate groovy script

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/adaptiveform.theme.healthcare/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__/adaptiveform.theme.easel/.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.healthcare]"
+    categories="[${appId}.adaptiveform.theme.easel]"
     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/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/adaptiveform.theme.wknd/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__/adaptiveform.theme.healthcare/.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.wknd]"
+    categories="[${appId}.adaptiveform.theme.healthcare]"
     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/adaptiveform.theme.fsi/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/theme-clientlibs/__appId__/adaptiveform.theme.wknd/.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.fsi]"
+    categories="[${appId}.adaptiveform.theme.wknd]"
     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/themes/easel/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__/easel/.content.xml

@@ -6,6 +6,6 @@
             jcr:primaryType="nt:unstructured"
             author="adobe"            
             description="Reference Easel Theme"
-            title="Reference Easel"/>
+            title="${appId} Reference Easel"/>
     </jcr:content>
 </jcr:root>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/fsi/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__/fsi/.content.xml

@@ -5,8 +5,7 @@
         <metadata
             jcr:primaryType="nt:unstructured"
             author="adobe"
-            jcr:createdBy="adobe"
             description="Reference FSI Theme"
-            title="Reference FSI"/>
+            title="${appId} Reference FSI"/>
     </jcr:content>
 </jcr:root>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/healthcare/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__/healthcare/.content.xml

@@ -5,8 +5,7 @@
         <metadata
             jcr:primaryType="nt:unstructured"
             author="adobe"
-            jcr:createdBy="adobe"
             description="Reference Healthcare Theme"
-            title="Reference Healthcare"/>
+            title="${appId} Reference Healthcare"/>
     </jcr:content>
 </jcr:root>

src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/wknd/.content.xml → src/main/archetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__/wknd/.content.xml

@@ -6,6 +6,6 @@
             jcr:primaryType="nt:unstructured"
             author="adobe"            
             description="Reference WKND Theme"
-            title="Reference WKND"/>
+            title="${appId} Reference WKND"/>
     </jcr:content>
 </jcr:root>

src/main/resources/META-INF/archetype-post-generate.groovy

@@ -215,6 +215,17 @@ if (includeForms == "n" && includeFormsenrollment == "n" && includeFormscommunic
     assert new File("$confFolder/settings/wcm/template-types/af-page-v2").deleteDir()
     assert new File("$confFolder/settings/wcm/template-types/afv2-fragment-page").deleteDir()
     assert new File("$confFolder/settings/wcm/templates/blank-af-v2").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/consent-form").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/contact-us-form").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/safety-inspection").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/log-service-request").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/request-for-statement").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/quality-control-inspection").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/purchase-request").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/benefits-enrollment").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/benefit-summary-request").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/give-feedback").deleteDir()
+    assert new File("$confFolder/settings/wcm/templates/contact-details-update").deleteDir()
     assert new File("$confFolder/forms").deleteDir()
 }
 if ((includeForms == "y" || includeFormsenrollment == "y" || includeFormscommunications == "y" || includeFormsheadless == "y") && aemVersion != "cloud") {