Skip to content

Commit

Permalink
Merge branch 'develop' into FORMS-9435_hideverticaltabs
Browse files Browse the repository at this point in the history
  • Loading branch information
barshat7 authored Sep 11, 2023
2 parents 4545f10 + 3452c84 commit 6c58a0e
Show file tree
Hide file tree
Showing 471 changed files with 7,252 additions and 67 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ To generate a project, adjust the following command line to your needs:
mvn -B org.apache.maven.plugins:maven-archetype-plugin:3.2.1:generate \
-D archetypeGroupId=com.adobe.aem \
-D archetypeArtifactId=aem-project-archetype \
-D archetypeVersion=43\
-D archetypeVersion=44\
-D appTitle="My Site" \
-D appId="mysite" \
-D groupId="com.mysite"
Expand Down Expand Up @@ -91,14 +91,15 @@ Name | Default | Description
`datalayer` | `y` | Activate integration with [Adobe Client Data Layer](https://docs.adobe.com/content/help/en/experience-manager-core-components/using/developing/data-layer/overview.html).
`amp` | `n` | Enable [AMP](https://docs.adobe.com/content/help/en/experience-manager-core-components/using/developing/amp.html) support for genenerated project templates.
`enableDynamicMedia` | `n` | Enabled foundation DynamicMedia components in project policy settings and activates Dynamic Media features in Core Image component's policy.
`enableSSR` | `n` | Option to enable SSR for the front-end project
`precompiledScripts` | `n` | Option to [precompile](https://experienceleague.adobe.com/docs/experience-manager-core-components/using/developing/archetype/precompiled-bundled-scripts.html) the server-side scripts from `ui.apps` and attach them to the build as a secondary bundle artifact in the `ui.apps` project. `aemVersion` should be set to `cloud`.
`includeFormsheadless` | `n` | Includes [Forms Core Components](https://github.com/adobe/aem-core-forms-components) dependencies, ui.frontend.react.forms.af and headless artifacts.
`enableSSR` | `n` | Option to enable SSR for the front-end project
`precompiledScripts` | `n` | Option to [precompile](https://experienceleague.adobe.com/docs/experience-manager-core-components/using/developing/archetype/precompiled-bundled-scripts.html) the server-side scripts from `ui.apps` and attach them to the build as a secondary bundle artifact in the `ui.apps` project. `aemVersion` should be set to `cloud`.
`includeFormsheadless` | `n` | Includes [Forms Core Components](https://github.com/adobe/aem-core-forms-components) dependencies, ui.frontend.react.forms.af and headless artifacts.
`uiTestingFramework` | `cypress` | Testing framework used for generating UI tests (can be `cypress` or `wdio`).
## System Requirements

Archetype | AEM as a Cloud Service | AEM 6.5 | Java SE | Maven
---------|---------|---------|---------|---------
[43](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-43) | Continual | 6.5.7.0+ | 8, 11 | 3.3.9+
[44](https://github.com/adobe/aem-project-archetype/releases/tag/aem-project-archetype-44) | Continual | 6.5.7.0+ | 8, 11 | 3.3.9+

Setup your local development environment for [AEM as a Cloud Service SDK](https://docs.adobe.com/content/help/en/experience-manager-learn/cloud-service/local-development-environment-set-up/overview.html) or for [older versions of AEM](https://docs.adobe.com/content/help/en/experience-manager-learn/foundation/development/set-up-a-local-aem-development-environment.html).

Expand Down
3 changes: 2 additions & 1 deletion VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ Archetype Version | AEM Version
20, 21, 22 | 6.5, 6.4, 6.3 + SP3
23 | 6.5, 6.4, 6.3 + SP3, AEM as a Cloud Service
24, 25, 26, 27 | 6.5.5, 6.4.8.1, AEM as a Cloud Service
28, 30, 31, 32, 33, 34, 35, 36, 37, 39, 40, 41, 42, 43 | 6.5.7, AEM as a Cloud Service
28, 30, 31, 32, 33, 34, 35, 36, 37, 39, 40, 41, 42, 43, 44 | 6.5.7, AEM as a Cloud Service
46 | 6.5.17, AEM as a Cloud Service
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<groupId>com.adobe.aem</groupId>
<artifactId>aem-project-archetype</artifactId>
<version>44-SNAPSHOT</version>
<version>45-SNAPSHOT</version>
<packaging>maven-archetype</packaging>

<name>AEM Multi-Module Archetype</name>
Expand Down
4 changes: 2 additions & 2 deletions src/main/archetype/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@ reports/

# Others
dispatcher/src/conf.d/variables/default.vars
ui.tests/test-module/assets/form/themes/**/*diff.png
ui.tests/test-module/assets/form/themes/**/*current.png
ui.tests.wdio/test-module/assets/form/themes/**/*diff.png
ui.tests.wdio/test-module/assets/form/themes/**/*current.png
15 changes: 4 additions & 11 deletions src/main/archetype/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ The main parts of the template are:
* ui.content: contains sample content using the components from the ui.apps
* ui.config: contains runmode specific OSGi configs for the project
* ui.frontend: an optional dedicated front-end build mechanism (Angular, React or general Webpack project)
* ui.tests: Selenium based UI tests
* ui.tests.cypress: Cypress based UI tests
* ui.tests.wdio: Selenium based UI tests
* all: a single content package that embeds all of the compiled modules (bundles and content packages) including any vendor dependencies
* analyse: this module runs analysis on the project which provides additional validation for deploying into AEMaaCS

Expand Down Expand Up @@ -95,17 +96,9 @@ can be found here https://github.com/adobe/aemanalyser-maven-plugin

### UI tests

They will test the UI layer of your AEM application using Selenium technology.
They will test the UI layer of your AEM application using either Cypress or Selenium technology.

To run them locally:

mvn clean verify -Pui-tests-local-execution

This default command requires:
* an AEM author instance available at http://localhost:4502 (with the whole project built and deployed on it, see `How to build` section above)
* Chrome browser installed at default location

Check README file in `ui.tests` module for more details.
Check README file in `ui.tests.cypress` or `ui.tests.wdio` module for more details.

## ClientLibs

Expand Down
1 change: 1 addition & 0 deletions src/main/archetype/archetype.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ enableDynamicMedia=${enableDynamicMedia}
enableSSR=${enableSSR}
precompiledScripts=${precompiledScripts}
includeFormsheadless=${includeFormsheadless}
uiTestingFramework=${uiTestingFramework}
2 changes: 1 addition & 1 deletion src/main/archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<aio.runtime.namespace>${env.AIO_RUNTIME_NAMESPACE}</aio.runtime.namespace>
<aio.runtime.auth>${env.AIO_RUNTIME_AUTH}</aio.runtime.auth>
#end
<core.wcm.components.version>2.22.12</core.wcm.components.version>
<core.wcm.components.version>2.23.2</core.wcm.components.version>
#if ( $includeCommerce == "y" )
<core.cif.components.version>2.12.0</core.cif.components.version>
<magento.graphql.version>9.1.0-magento242ee</magento.graphql.version>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:Component"
jcr:title="Adaptive Form Fragment"
jcr:description="Adaptive Form Fragment placeholder (v1) component"
sling:resourceSuperType="core/fd/components/form/fragment/v1/fragment"
componentGroup="${appTitle} - Adaptive Form"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="nt:unstructured"
jcr:title="Fragment"
fieldType="panel"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
jcr:primaryType="cq:Component"
jcr:title="Adaptive Form Fragment Container (Core Component)"
jcr:description="Adaptive Form Fragment Container (Core Component) (v1) component"
sling:resourceSuperType="core/fd/components/form/fragmentcontainer/v1/fragmentcontainer"
componentGroup=".hidden"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="nt:unstructured"
jcr:title="Form Container"
fd:version="2.1"
fieldType="form"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
cq:icon="shield"
jcr:primaryType="cq:Component"
jcr:title="Adaptive Form reCAPTCHA"
jcr:description="Adaptive Form reCAPTCHA (v1) component"
sling:resourceSuperType="core/fd/components/form/recaptcha/v1/recaptcha"
componentGroup="${appTitle} - Adaptive Form"/>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="nt:unstructured"
jcr:title="CAPTCHA"
required="{Boolean}true"
fieldType="captcha"/>
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@
#if ( $includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y" )
<af-page-v2/>
#end
#if ( $aemVersion == "cloud" and ( $includeForms == "y" or $includeFormsenrollment == "y" or $includeFormscommunications == "y" or $includeFormsheadless == "y") )
<afv2-fragment-page/>
#end
</jcr:root>
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
cq:policy="${appId}/components/page/policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mappings">
<parsys1
cq:policy="fd/af/components/responsivegrid/page-header"
<container1
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-header"
layout="responsiveGrid"/>
<guideContainer
cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping">
</guideContainer>
<parsys2
cq:policy="fd/af/components/responsivegrid/page-footer"
<container2
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
sling:resourceType="wcm/core/components/policies/mapping"
cq:policy="fd/af/components/responsivegrid/page-footer"
layout="responsiveGrid"/>
</jcr:content>
</jcr:root>
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,23 @@
guideComponentType="fd/af/templates"
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page">
<parsys1
<container1
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<guideContainer
fd:version="2.1"
fieldType="form"
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="${appId}/components/adaptiveForm/formcontainer">
</guideContainer>
<parsys2
<container2
jcr:primaryType="nt:unstructured"
editable="{Boolean}true"
sling:resourceType="wcm/foundation/components/responsivegrid"/>
sling:resourceType="core/wcm/components/container/v1/container"
layout="responsiveGrid"
editable="{Boolean}true" />
<cq:responsive jcr:primaryType="nt:unstructured">
<breakpoints jcr:primaryType="nt:unstructured">
<smallScreen
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="cq:Template">
<jcr:content
jcr:description="Adaptive Form Fragment Template with core components."
jcr:primaryType="cq:PageContent"
jcr:title="Adaptive Form Fragment (Core Components)"/>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:deviceGroups="[/etc/mobile/groups/responsive]"
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page"
#if ( $aemVersion == "cloud")
sling:configRef="/conf/${appId}/forms"
#end
guideComponentType="fd/af/templates">
<guideContainer
fd:version="2.1"
jcr:primaryType="nt:unstructured"
sling:resourceType="${appId}/components/adaptiveForm/fragmentcontainer"
fieldType="form"
fd:type="fragment"/>
</jcr:content>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:policy="${appId}/components/page/policy"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mappings">
<guideContainer
cq:policy="${appId}/components/adaptiveForm/formcontainer/default"
jcr:primaryType="nt:unstructured"
sling:resourceType="wcm/core/components/policies/mapping"/>
</jcr:content>
</jcr:root>
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
jcr:primaryType="cq:Page">
<jcr:content
cq:deviceGroups="[/etc/mobile/groups/responsive]"
jcr:primaryType="cq:PageContent"
sling:resourceType="${appId}/components/adaptiveForm/page"
guideComponentType="fd/af/templates">
<guideContainer
fd:version="2.1"
jcr:primaryType="nt:unstructured"
sling:resourceType="${appId}/components/adaptiveForm/fragmentcontainer"
editable="{Boolean}true"
fieldType="form"
fd:type="fragment"/>
<cq:responsive jcr:primaryType="nt:unstructured">
<breakpoints jcr:primaryType="nt:unstructured">
<smallScreen
jcr:primaryType="nt:unstructured"
title="Smaller Screen"
width="{Decimal}479"/>
<phone
jcr:primaryType="nt:unstructured"
title="Phone"
width="{Decimal}767"/>
<tablet
jcr:primaryType="nt:unstructured"
title="Tablet"
width="{Decimal}991"/>
</breakpoints>
</cq:responsive>
</jcr:content>
</jcr:root>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
jcr:primaryType="cq:Template">
<jcr:content
author="adobe"
cq:isDelivered="{Boolean}true"
cq:lastModified="{Date}2023-07-03T10:40:00.760Z"
cq:lastModifiedBy="admin"
cq:lastReplicated="{Date}2023-05-25T15:46:21.326Z"
cq:lastReplicated_publish="{Date}2023-05-25T15:46:21.326Z"
cq:lastReplicatedBy="admin"
cq:lastReplicatedBy_publish="admin"
cq:lastReplicationAction="Activate"
cq:lastReplicationAction_publish="Activate"
cq:templateType="/conf/${appId}/settings/wcm/template-types/af-page-v2"
jcr:description="The Employee Benefits Summary form is used to gather essential details about an individual's benefits. It helps in evaluating coverage quickly and accurately, providing a comprehensive overview for efficient assistance and support."
jcr:primaryType="cq:PageContent"
jcr:title="Employee Benefits Summary"
status="enabled"/>
</jcr:root>
Loading

0 comments on commit 6c58a0e

Please sign in to comment.