adobe · pankaj-parashar · Nov 29, 2023 · Nov 22, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/output.log b/output.log
diff --git a/src/main/archetype/ui.apps/pom.xml b/src/main/archetype/ui.apps/pom.xml
@@ -55,9 +55,10 @@
                     <group>${groupId}</group>
                     <name>${artifactId}</name>
                     <packageType>application</packageType>
-                    #if (($includeForms == "y" || $includeFormsenrollment == "y" || $includeFormscommunications == "y" || $includeFormsheadless == "y") && $aemVersion == "cloud")
+#if (($includeForms == "y" || $includeFormsenrollment == "y" || $includeFormscommunications == "y" || $includeFormsheadless == "y") && $aemVersion == "cloud")
                     <skipSubPackageValidation>true</skipSubPackageValidation>
-                    #end
+                    <accessControlHandling>merge</accessControlHandling>
+#end
                     <repositoryStructurePackages>
                         <repositoryStructurePackage>
                             <groupId>${groupId}</groupId>

diff --git a/...etype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-easel/_rep_policy.xml b/...etype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-easel/_rep_policy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <allow
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:read]"/>
+</jcr:root>
diff --git a/...chetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-fsi/_rep_policy.xml b/...chetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-fsi/_rep_policy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <allow
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:read]"/>
+</jcr:root>
diff --git a/.../ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-healthcare/_rep_policy.xml b/.../ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-healthcare/_rep_policy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <allow
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:read]"/>
+</jcr:root>
diff --git a/...hetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-wknd/_rep_policy.xml b/...hetype/ui.apps/src/main/content/jcr_root/apps/fd/af/themes/__appId__-wknd/_rep_policy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <allow
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:read]"/>
+</jcr:root>
diff --git a/...pe/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml b/...pe/ui.content/src/main/content/jcr_root/conf/__appId__/settings/wcm/policies/.content.xml
@@ -405,6 +405,28 @@
                         </assetToComponentMapping>
                     </cq:authoring>
                 </policy_1575040440977>
+#if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y")
+                <cc-af-header-policy
+                    jcr:lastModified="{Date}2023-06-07T15:48:33.506+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Core Component Adaptive Form Header Policy"
+                    jcr:description="Includes only Core Component Adaptive Form header component."
+                    sling:resourceType="wcm/core/components/policy/policy"
+                    components="/apps/${appId}/components/adaptiveForm/pageheader">
+                    <jcr:content jcr:primaryType="nt:unstructured"/>
+                </cc-af-header-policy>
+                <cc-af-footer-policy
+                    jcr:lastModified="{Date}2022-07-12T11:41:57.902+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Core Component Adaptive Form Footer Policy"
+                    jcr:description="Includes only Core Component Adaptive Form footer component."
+                    sling:resourceType="wcm/core/components/policy/policy"
+                    components="/apps/${appId}/components/adaptiveForm/footer">
+                    <jcr:content jcr:primaryType="nt:unstructured"/>
+                </cc-af-footer-policy>
+    #end                
             </container>
             <teaser jcr:primaryType="nt:unstructured">
                 <policy_1575031387650
@@ -684,28 +706,7 @@
                         <jcr:content jcr:primaryType="nt:unstructured"/>
                     </policy_1518118565779>
     #end
-    #if ($includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y")
-                    <cc-af-header-policy
-                        jcr:lastModified="{Date}2023-06-07T15:48:33.506+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Core Component Adaptive Form Header Policy"
-                        jcr:description="Includes only Core Component Adaptive Form header component."
-                        sling:resourceType="wcm/core/components/policy/policy"
-                        components="/apps/${appId}/components/adaptiveForm/pageheader">
-                        <jcr:content jcr:primaryType="nt:unstructured"/>
-                    </cc-af-header-policy>
-                    <cc-af-footer-policy
-                        jcr:lastModified="{Date}2022-07-12T11:41:57.902+05:30"
-                        jcr:lastModifiedBy="admin"
-                        jcr:primaryType="nt:unstructured"
-                        jcr:title="Core Component Adaptive Form Footer Policy"
-                        jcr:description="Includes only Core Component Adaptive Form footer component."
-                        sling:resourceType="wcm/core/components/policy/policy"
-                        components="/apps/${appId}/components/adaptiveForm/footer">
-                        <jcr:content jcr:primaryType="nt:unstructured"/>
-                    </cc-af-footer-policy>
-    #end
+
                 </responsivegrid>
             </components>
         </foundation>

diff --git a/...tent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml b/...tent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/policies/.content.xml
@@ -8,7 +8,7 @@
         <container1
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"
-            cq:policy="fd/af/components/responsivegrid/page-header"
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             layout="responsiveGrid"/>
         <guideContainer
             cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
@@ -18,7 +18,7 @@
         <container2
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"
-            cq:policy="fd/af/components/responsivegrid/page-footer"
+            cq:policy="${appId}/components/container/cc-af-footer-policy"
             layout="responsiveGrid"/>
     </jcr:content>
 </jcr:root>
diff --git a/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml b/...ent/jcr_root/conf/__appId__/settings/wcm/template-types/af-page-v2/structure/.content.xml
@@ -9,7 +9,7 @@
         sling:resourceType="${appId}/components/adaptiveForm/page">
         <container1
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="core/wcm/components/container/v1/container"
+            sling:resourceType="${appId}/components/container"
             layout="responsiveGrid"
             editable="{Boolean}true" />
         <guideContainer
@@ -21,7 +21,7 @@
         </guideContainer>
         <container2
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="core/wcm/components/container/v1/container"
+            sling:resourceType="${appId}/components/container"
             layout="responsiveGrid"
             editable="{Boolean}true" />
         <cq:responsive jcr:primaryType="nt:unstructured">

diff --git a/...r_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml b/...r_root/conf/__appId__/settings/wcm/templates/benefit-summary-request/initial/.content.xml
@@ -24,10 +24,10 @@
                 jcr:lastModified="{Date}2023-06-15T10:15:15.538Z"
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
-                jcr:title="Text"
+                jcr:title="Form Introduction"
                 sling:resourceType="${appId}/components/adaptiveForm/text"
                 fieldType="plain-text"
-                name="text_21451224891684997830821"
+                name="FormIntro"
                 textIsRich="true"
                 value="&lt;p>Please complete the following form to request a benefit summary. These details will help us provide you with an overview of your eligible benefits.&lt;/p>&#xd;&#xa;"/>
             <textinput
@@ -202,14 +202,15 @@
                 <cq:responsive jcr:primaryType="nt:unstructured">
                     <default
                         jcr:primaryType="nt:unstructured"
-                        offset="6"
-                        width="6"/>
+                        offset="0"
+                        width="12"/>
                 </cq:responsive>
             </submit>
         </guideContainer>
-        <parsys1
+        <container1
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="wcm/foundation/components/responsivegrid">
+            sling:resourceType="${appId}/components/container"
+            layout="responsiveGrid">
             <pageheader
                 jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                 jcr:lastModifiedBy="admin"
@@ -241,15 +242,16 @@
                     jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
-                    sling:resourceType="wcm/foundation/components/text"
+                    sling:resourceType="${appId}/components/text"
                     text="&lt;p>Employee Benefits Summary&lt;/p>&#xd;&#xa;"
                     textIsRich="true"
                     value="Company Name Here"/>
             </pageheader>
-        </parsys1>
-        <parsys2
+        </container1>
+        <container2
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="wcm/foundation/components/responsivegrid">
+            sling:resourceType="${appId}/components/container"
+            layout="responsiveGrid">
             <footer
                 jcr:lastModified="{Date}2023-05-25T06:28:44.438Z"
                 jcr:lastModifiedBy="admin"
@@ -261,11 +263,11 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Footer"
-                    sling:resourceType="core/wcm/components/text/v2/text"
+                    sling:resourceType="${appId}/components/text"
                     css="footerText"
                     text="&lt;p>© YYYY WKND | All rights reserved.&lt;/p>&#xd;&#xa;"
                     textIsRich="true"/>
             </footer>
-        </parsys2>
+        </container2>
     </jcr:content>
 </jcr:root>
diff --git a/..._root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml b/..._root/conf/__appId__/settings/wcm/templates/benefit-summary-request/policies/.content.xml
@@ -7,16 +7,16 @@
         cq:policy="${appId}/components/page/default"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <parsys1
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-header-policy"
+        <container1
+            cq:policy="${appId}/components/container/cc-af-header-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
         <guideContainer
             cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
-        <parsys2
-            cq:policy="wcm/foundation/components/responsivegrid/cc-af-footer-policy"
+        <container2
+            cq:policy="${appId}/components/container/cc-af-footer-policy"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping"/>
     </jcr:content>

diff --git a/...root/conf/__appId__/settings/wcm/templates/benefit-summary-request/structure/.content.xml b/...root/conf/__appId__/settings/wcm/templates/benefit-summary-request/structure/.content.xml
@@ -17,19 +17,21 @@
         jcr:uuid="aa07e3c9-a52a-44bc-9c9c-27591f605aad"
         sling:resourceType="${appId}/components/adaptiveForm/page"
         guideComponentType="fd/af/templates">
-        <parsys1
+        <container1
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="wcm/foundation/components/responsivegrid"
+            sling:resourceType="${appId}/components/container"
+            layout="responsiveGrid"
             editable="{Boolean}true"/>
         <guideContainer
             fd:version="2.1"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="${appId}/components/adaptiveForm/formcontainer"
             editable="{Boolean}true"
             fieldType="form"/>
-        <parsys2
+        <container2
             jcr:primaryType="nt:unstructured"
-            sling:resourceType="wcm/foundation/components/responsivegrid"
+            sling:resourceType="${appId}/components/container"
+            layout="responsiveGrid"
             editable="{Boolean}true"/>
         <cq:responsive jcr:primaryType="nt:unstructured">
             <breakpoints jcr:primaryType="nt:unstructured">