diff --git a/.gitignore b/.gitignore index 792366ec6..9787020f0 100755 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ target .project .settings maven-eclipse.xml +.factorypath *.iml *.ipr *.iws @@ -54,4 +55,4 @@ devops___* #stats files .stats -.stats/* \ No newline at end of file +.stats/* diff --git a/README.md b/README.md index 2932284df..83bf0e077 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# AEM.Design Core +# AEM.Design Core [![build_status](https://github.com/aem-design/aemdesign-aem-core/workflows/ci/badge.svg?branch=develop)](https://github.com/aem-design/aemdesign-aem-core/actions?workflow=ci) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=design.aem%3Aaemdesign-aem-core&metric=alert_status)](https://sonarcloud.io/dashboard?id=design.aem%3Aaemdesign-aem-core) [![codecov](https://codecov.io/gh/aem-design/aemdesign-aem-core/branch/master/graph/badge.svg?magic)](https://codecov.io/gh/aem-design/aemdesign-aem-core) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/design.aem/aemdesign-aem-common/badge.svg?magic)](https://maven-badges.herokuapp.com/maven-central/design.aem/aemdesign-aem-common) -[![github license](https://img.shields.io/github/license/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) -[![github issues](https://img.shields.io/github/issues/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) -[![github last commit](https://img.shields.io/github/last-commit/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) -[![github repo size](https://img.shields.io/github/repo-size/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) -[![github repo size](https://img.shields.io/github/languages/code-size/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) +[![github license](https://img.shields.io/github/license/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) +[![github issues](https://img.shields.io/github/issues/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) +[![github last commit](https://img.shields.io/github/last-commit/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) +[![github repo size](https://img.shields.io/github/repo-size/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) +[![github repo size](https://img.shields.io/github/languages/code-size/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) [![github release](https://img.shields.io/github/release/aem-design/aemdesign-aem-core)](https://github.com/aem-design/aemdesign-aem-core) [![CodeFactor](https://www.codefactor.io/repository/github/aem-design/aemdesign-aem-core/badge)](https://www.codefactor.io/repository/github/aem-design/aemdesign-aem-core) [![Visit AEM.Design](https://img.shields.io/badge/visit-aem.design-brightgreen)](https://aem.design/) @@ -18,12 +18,13 @@ A set of standardized components for AEM 6.4+ that can be used to speed up devel ## Documentation -* [AEM.Design Blog](https://aem.design) -* [AEM.Design SonarCloud](https://sonarcloud.io/project/issues?id=design.aem%3Aaemdesign-aem-core) +- [AEM.Design Blog](https://aem.design) +- [AEM.Design SonarCloud](https://sonarcloud.io/project/issues?id=design.aem%3Aaemdesign-aem-core) -You will require a latest version of [aemdesign-aem-compose](https://github.com/aem-design/aemdesign-aem-support/releases) that has the base dialog's configuration content. +You will require a latest version of [aemdesign-aem-compose](https://github.com/aem-design/aemdesign-aem-support/releases) that has the base dialog's configuration content. ## Development + If you're curious about how the next generation of components looks like, a tech preview is made available in the [`develop`](https://github.com/aem-design/aemdesign-aem-core/tree/develop) branch. @@ -35,86 +36,87 @@ Contributions are welcome! Read the [Contributing Guide](CONTRIBUTING.md) for mo Detailed table of component can be found here [Component List](https://github.com/aem-design/aemdesign-aem-core/wiki/Component-List) -| Component Category | Link | -|----------------------------------------------------------------- |---------------------------------------------------------------------------------------------------------------------------------------- | -| Cloud Services / Rest | [Rest](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/rest) | -| Cloud Services / Salesforce API | [Salesforce API](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/salesforceapi) | -| Common / Redirection Notification | [Redirection Notification](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification) | -| Common / Static Content Include | [Static Content Include](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude) | -| Common / Timing Component | [Timing Component](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing) | -| Content / File Download Link | [File Download Link](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download) | -| Content / Embed Source | [Embed Source](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource) | -| Content / External | [External](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external) | -| Content / Link | [Link](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link) | -| Content / Content Reference | [Content Reference](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference) | -| Content / Content Fragment | [Content Fragment](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment) | -| Content / Content Template | [Content Template](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/contenttemplate) | -| Content / Table | [Table](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table) | -| Content / Rich Text | [Rich Text](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text) | -| Content / Tool Tip | [Tool Tip](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip) | -| Content / Page Author | [Page Author](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor) | -| Content / Page Date | [Page Date](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate) | -| Content / Page Description | [Page Description](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription) | -| Content / Page Tags | [Page Tags](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags) | -| Content / Page Title | [Page Title](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle) | -| Details / Generic Details | [Generic Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details) | -| Details / Contact Details | [Contact Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details) | -| Details / Event Details | [Event Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details) | -| Details / Location Details | [Location Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details) | -| Details / News Details | [News Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details) | -| Details / Page Details | [Page Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details) | -| Layout / Article | [Article](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article) | -| Layout / Aside | [Aside](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside) | -| Layout / Breadcrumb | [Breadcrumb](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb) | -| Layout / Columns | [Columns](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl) | -| Layout / Content Block | [Content Block](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock) | -| Layout / Content Block Lock | [Content Block Lock](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock) | -| Layout / Content Block Menu | [Content Block Menu](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock) | -| Layout / Content Tabs | [Content Tabs](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs) | -| Layout / Footer | [Footer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer) | -| Layout / Header | [Header](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header) | -| Layout / Nav Bar | [Nav Bar](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar) | -| Layout / Container | [Container](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container) | -| Lists / Asset List | [Asset List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist) | -| Lists / Contact List | [Contact List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist) | -| Lists / Event List | [Event List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist) | -| Lists / Lang Nav | [Lang Nav](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/langnav/v2/langnav) | -| Lists / List | [List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list) | -| Lists / List Nav | [List Nav](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav) | -| Lists / Location List | [Location List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist) | -| Lists / News List | [News List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist) | -| Lists / Page List | [Page List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist) | -| Lists / Search Results List | [Search Results List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist) | -| Lists / Tag List | [Tag List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist) | -| Lists / Nav List | [Nav List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist) | -| Media / Audio | [Audio](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio) | -| Media / Image | [Image](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image) | -| Media / Video | [Video](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video) | -| Analytics / Analytics Data Layer | [Analytics Data Layer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer) | -| Template / AEM.Design Base Page | [AEM.Design Base Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v3/base) | -| Template / Cloud Config / AddThis | [AddThis](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/addthisconnect/config) | -| Template / Cloud Config / Google Analytics | [Google Analytics](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googleanalytics/config) | -| Template / Cloud Config / Google Map | [Google Map](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googlemap/config) | -| Template / Column / AEM.Design One Column Page | [AEM.Design One Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/one/v2/one) | -| Template / Column / AEM.Design Three Column Page | [AEM.Design Three Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/three/v2/three) | -| Template / Column / AEM.Design Two Column Page | [AEM.Design Two Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/two/v2/two) | -| Template / Common / Design Importer | [Design Importer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/common/design-importer) | -| Template / Experience Fragment / AEM.Design Experience Fragment | [AEM.Design Experience Fragment](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/base/v2/xfpage) | -| Widgets / AddThis / Addthis Button | [Addthis Button](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton) | -| Widgets / Online Media | [Online Media](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia) | -| Widgets / Search Box | [Search Box](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search) | -| Workflow / Process Payload | [Process Payload](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/processpayload) | -| Workflow / Project Task Manager | [Project Task Manager](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/projecttaskmanager) | -| Workflow / Project Update | [Project Update](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/projectupdate) | -| Workflow / Rest | [Rest](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/rest) | -| Workflow / Salesforce API | [Salesforce API](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/salesforceapi) | -| Workflow / Send Email | [Send Email](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/sendemail) | -| Coral / Common/Form / Tag Field | [Tag Field](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/form/tagfield) | -| Coral / Datasources / Forms | [Forms](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/forms) | -| Coral / Datasources / Tags | [Tags](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags) | -| Coral / Foundation / Accordion | [Accordion](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/foundation/accordion) | -| Coral / Widgets/Form / Asset Options | [Asset Options](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/assetoptions) | -| Replication / Akamai Cache Flush | [Akamai Cache Flush](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai) | +| Component Category | Link | +| --------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Cloud Services / Rest | [Rest](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/rest) | +| Cloud Services / Salesforce API | [Salesforce API](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/salesforceapi) | +| Common / Redirection Notification | [Redirection Notification](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/redirectnotification) | +| Common / Static Content Include | [Static Content Include](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/staticinclude) | +| Common / Timing Component | [Timing Component](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/timing) | +| Content / File Download Link | [File Download Link](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/download) | +| Content / Embed Source | [Embed Source](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/embedsource) | +| Content / External | [External](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/external) | +| Content / Link | [Link](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/link) | +| Content / Content Reference | [Content Reference](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/reference) | +| Content / Content Fragment | [Content Fragment](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment) | +| Content / Content Template | [Content Template](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/contenttemplate) | +| Content / Table | [Table](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/table) | +| Content / Rich Text | [Rich Text](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/text) | +| Content / Tool Tip | [Tool Tip](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/tooltip) | +| Content / Page Author | [Page Author](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/pageauthor) | +| Content / Page Date | [Page Date](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/pagedate) | +| Content / Page Description | [Page Description](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/pagedescription) | +| Content / Page Tags | [Page Tags](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/pagetags) | +| Content / Page Title | [Page Title](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/pagetitle) | +| Details / Generic Details | [Generic Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details) | +| Details / Contact Details | [Contact Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/contact-details) | +| Details / Event Details | [Event Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/event-details) | +| Details / Location Details | [Location Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/location-details) | +| Details / News Details | [News Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/news-details) | +| Details / Page Details | [Page Details](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/page-details) | +| Layout / Article | [Article](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/article) | +| Layout / Aside | [Aside](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/aside) | +| Layout / Breadcrumb | [Breadcrumb](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/breadcrumb) | +| Layout / Columns | [Columns](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/colctrl) | +| Layout / Content Block | [Content Block](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/contentblock) | +| Layout / Content Block Lock | [Content Block Lock](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock) | +| Layout / Content Block Menu | [Content Block Menu](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/contentblocklock) | +| Layout / Content Tabs | [Content Tabs](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/contenttabs) | +| Layout / Footer | [Footer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/footer) | +| Layout / Header | [Header](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/header) | +| Layout / Nav Bar | [Nav Bar](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/navbar) | +| Layout / Container | [Container](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container) | +| Lists / Asset List | [Asset List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/assetlist) | +| Lists / Contact List | [Contact List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/contactlist) | +| Lists / Event List | [Event List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/eventlist) | +| Lists / Lang Nav | [Lang Nav](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/langnav/v2/langnav) | +| Lists / List | [List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/list) | +| Lists / List Nav | [List Nav](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/listnav) | +| Lists / Location List | [Location List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/locationlist) | +| Lists / News List | [News List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/newslist) | +| Lists / Page List | [Page List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/pagelist) | +| Lists / Search Results List | [Search Results List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/searchlist) | +| Lists / Tag List | [Tag List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/taglist) | +| Lists / Nav List | [Nav List](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/navlist) | +| Media / Audio | [Audio](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/audio) | +| Media / Image | [Image](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/image) | +| Media / Video | [Video](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/video) | +| Analytics / Analytics Data Layer | [Analytics Data Layer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/datalayer) | +| Template / AEM.Design Base Page | [AEM.Design Base Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/base/v3/base) | +| Template / Cloud Config / AddThis | [AddThis](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/addthisconnect/config) | +| Template / Cloud Config / Google Analytics | [Google Analytics](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googleanalytics/config) | +| Template / Cloud Config / Google Map | [Google Map](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googlemap/config) | +| Template / Column / AEM.Design One Column Page | [AEM.Design One Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/one/v2/one) | +| Template / Column / AEM.Design Three Column Page | [AEM.Design Three Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/three/v2/three) | +| Template / Column / AEM.Design Two Column Page | [AEM.Design Two Column Page](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/two/v2/two) | +| Template / Common / Design Importer | [Design Importer](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/common/design-importer) | +| Template / Experience Fragment / AEM.Design Experience Fragment | [AEM.Design Experience Fragment](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/base/v2/xfpage) | +| Widgets / AddThis / Addthis Button | [Addthis Button](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/sharebutton) | +| Widgets / Online Media | [Online Media](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/onlinemedia) | +| Widgets / Search Box | [Search Box](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/search) | +| Workflow / Content Fragment Page Generation | [Content Fragment Page Generation](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen) | +| Workflow / Process Payload | [Process Payload](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/processpayload) | +| Workflow / Project Task Manager | [Project Task Manager](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/projecttaskmanager) | +| Workflow / Project Update | [Project Update](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/projectupdate) | +| Workflow / Rest | [Rest](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/rest) | +| Workflow / Salesforce API | [Salesforce API](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/salesforceapi) | +| Workflow / Send Email | [Send Email](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/sendemail) | +| Coral / Common/Form / Tag Field | [Tag Field](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/form/tagfield) | +| Coral / Datasources / Forms | [Forms](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/forms) | +| Coral / Datasources / Tags | [Tags](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/tags) | +| Coral / Foundation / Accordion | [Accordion](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/foundation/accordion) | +| Coral / Widgets/Form / Asset Options | [Asset Options](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/assetoptions) | +| Replication / Akamai Cache Flush | [Akamai Cache Flush](https://github.com/aem-design/aemdesign-aem-core/tree/master/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/replication/akamai) | ## Component Versioning @@ -126,21 +128,22 @@ Following is a description of each repo and their purpose. For more information see [Project Artifacts](http://aem.design/manifesto/project/#project-artifacts) -| Repo | Notes | -|---------------------------------|---------------------------------------------| -| aemdesign-aem-author/ | has all of the components and configurations that modify/update AEM | -| aemdesign-aem-common/ | has all of the components code | -| aemdesign-aem-core-deploy/ | monolith package for all projects | -| aemdesign-aem-services/ | has all of the code that compiled and installed by common project | +| Repo | Notes | +| -------------------------- | ------------------------------------------------------------------- | +| aemdesign-aem-author/ | has all of the components and configurations that modify/update AEM | +| aemdesign-aem-common/ | has all of the components code | +| aemdesign-aem-core-deploy/ | monolith package for all projects | +| aemdesign-aem-services/ | has all of the code that compiled and installed by common project | ## System Requirements The latest version of the Core Components, require the below system requirements: -| AEM Version | [2.0.0](https://github.com/aem-design/aemdesign-aem-core/tag/2.0.0) | -| ----- | --- | -| 6.4 | yes | -| 6.5 | yes | +| AEM Version | [2.0.0](https://github.com/aem-design/aemdesign-aem-core/tag/2.0.0) | +| ----------- | ------------------------------------------------------------------- | +| 6.4 | yes | +| 6.5 | yes | +| SDK | yes | ## Installation @@ -159,21 +162,21 @@ Following packages are dependencies and should be installed on your AEM instance - [Netcentric Access Control Tool 2.3.2](http://repo1.maven.org/maven2/biz/netcentric/cq/tools/accesscontroltool/accesscontroltool-package/2.3.2/accesscontroltool-package-2.3.2.zip) - [Adobe Vanity URL 1.0.2](https://www.adobeaemcloud.com/content/companies/public/adobe/packages/cq600/component/vanityurls-components/jcr%3acontent/package/file.res/vanityurls-components-1.0.2.zip) - ## Build The project has the following requirements: -* Java SE Development Kit 8 or Java SE Development Kit 11 -* Apache Maven 3.3.1 or newer + +- Java SE Development Kit 8 or Java SE Development Kit 11 +- Apache Maven 3.3.1 or newer For ease of build and installation the following profiles are provided: - * ``installdeploymentpackage`` - installs the deploy package/bundle to an existing AEM author instance +- `installdeploymentpackage` - installs the deploy package/bundle to an existing AEM author instance You can use helper script for ease of local deployment -* ``deploy-local`` - deploy aemdesign-aem-core-deploy package to your local AEM instance running on port 4502 -* ``deploy-local-publish`` - deploy aemdesign-aem-core-deploy package to your local AEM instance running on port 4503 +- `deploy-local` - deploy aemdesign-aem-core-deploy package to your local AEM instance running on port 4502 +- `deploy-local-publish` - deploy aemdesign-aem-core-deploy package to your local AEM instance running on port 4503 ### UberJar @@ -182,22 +185,21 @@ This project relies on the AEM 6.4 cq-quickstart. This is publicly available on For more details about the UberJar please head over to the [How to Build AEM Projects using Apache Maven](https://helpx.adobe.com/experience-manager/6-4/sites/developing/using/ht-projects-maven.html) documentation page. - ## Include core components into your own project maven build To add core components to your project, you will need to add it to your maven build. -The released version of the framework are available on the public maven repository at https://repo1.maven.org/maven2/design/aem/aemdesign-aem-core-deploy/ +The released version of the framework are available on the public maven repository at https://repo1.maven.org/maven2/design/aem/aemdesign-aem-core-deploy/ To include the deploy package into your own project's maven build using maven you can add the dependency to your pom.xml like this - ``` - - design.aem - aemdesign-aem-core-deploy - zip - 2.0.100 - - ``` +``` + + design.aem + aemdesign-aem-core-deploy + zip + 2.0.100 + +``` and then add this subpackage to your sub package section @@ -219,61 +221,40 @@ Following section describes some of the development topics Version numbers for Git Tags should follow semver format: - * **MAJOR** version when you make incompatible API changes, - * **MINOR** version when you add functionality in a backwards-compatible manner, and - * **PATCH** version when you make small incremental changes +- **MAJOR** version when you make incompatible API changes, +- **MINOR** version when you add functionality in a backwards-compatible manner, and +- **PATCH** version when you make small incremental changes ## Minimal core artifacts required for providing overridable AEM components. - + `aemdesign-aem-core-deploy` module creates an aem package for deployment which contains: - * `aemdesign-aem-author` - * `amedesign-aem-common` - + +- `aemdesign-aem-author` +- `amedesign-aem-common` + `aemdesign-aem-common` module embeds bundles: - * `aemdesign-aem-services` - + +- `aemdesign-aem-services` + ## To build + To ensure the project builds correctly locally run: `mvn -Dvault.useProxy=false -DskipTests -e -U clean package` ## To deploy + To build and deploy the project to your local aem instance (default localhost:4502), in the project root run: `./deploy-local` -## To create a release -Releases are managed via the maven plugins `versions-maven-plugin` and `maven-scm-plugin` - -Version numbers should follow the [SemVer](https://semver.org/) convention. - -## Release Versions - -Release versions are automated and based on Tags in format MAJOR.MINOR and Commit count from Tag using the `git describe` command. - -To test git versioning run - -`git describe` - -this will show you generated version message with latest tag and how many commits since tag. - -If you get an error: - -`fatal: No annotated tags can describe` - -create a new tag for your current version MAJOR.MINOR, the rest will be automated: - -`git tag 2.1 -f -m "2.1"` - -To create a release all you need to do is create a tag MAJOR.MINOR on master branch and push it. - ## Version Convention Version numbers for Git Tags should follow semver format: - * MAJOR version when you make incompatible API changes, - * MINOR version when you add functionality in a backwards-compatible manner, and - * PATCH version is automatically generated based on git commit count from last Tag +- MAJOR version when you make incompatible API changes, +- MINOR version when you add functionality in a backwards-compatible manner, and +- PATCH version is automatically generated based on git commit count from last Tag Please use MAJOR and MINOR version in Tags, PATCH version will be automatically added as a commit count since the last tag using the git describe. diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml index 286e38eb6..68537e0a1 100755 --- a/aemdesign-aem-author/pom.xml +++ b/aemdesign-aem-author/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.1.306 + 2.1.321 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-author - 2.1.306 + 2.1.321 content-package AEM Design - Core - AEM Author UI Updates AEM.Design extensions and libraries that enhance the default authoring UI @@ -160,15 +160,11 @@ org.apache.sling org.apache.sling.api - 2.2.0 - provided org.apache.sling org.apache.sling.jcr.api - 2.1.0 - provided - + org.apache.commons commons-lang3 diff --git a/aemdesign-aem-common/deploy b/aemdesign-aem-common/deploy deleted file mode 100755 index 049f3fc94..000000000 --- a/aemdesign-aem-common/deploy +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -POM_FILE="../pom.xml" -PARENT_PROJECT_PATH="$(realpath ..)" -SCRIPT_PARAMS="$@" - -source "../scripts/functions.sh" - -set_term_title "Common Deploy" -echo "- Deploy" -mvn -Dvault.useProxy=false -DskipTests clean install -P autoInstallPackage "$@" -echo "- Deployed" - diff --git a/aemdesign-aem-common/deploy-local b/aemdesign-aem-common/deploy-local deleted file mode 100755 index d1f6e843f..000000000 --- a/aemdesign-aem-common/deploy-local +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -./deploy -Daem.host=localhost diff --git a/aemdesign-aem-common/deploy-publish b/aemdesign-aem-common/deploy-publish deleted file mode 100755 index 06229124b..000000000 --- a/aemdesign-aem-common/deploy-publish +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -./deploy -Daem.port=4503 diff --git a/aemdesign-aem-common/deploy-publish-local b/aemdesign-aem-common/deploy-publish-local deleted file mode 100755 index 442824f27..000000000 --- a/aemdesign-aem-common/deploy-publish-local +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -./deploy -Daem.host=localhost -Daem.port=4503 diff --git a/aemdesign-aem-common/deploy.ps1 b/aemdesign-aem-common/deploy.ps1 index 769158a02..92df10a80 100644 --- a/aemdesign-aem-common/deploy.ps1 +++ b/aemdesign-aem-common/deploy.ps1 @@ -1,22 +1,27 @@ Param( - [string]$LOG_PATH = "${PWD}\logs", + [string]$LOG_PATH = "..\logs", [string]$LOG_PEFIX = "deploy", [string]$LOG_SUFFIX = ".log", - [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker", + [string]$DOCKER_LOGS_FOLDER = "..\logs\docker", [string]$AEM_SCHEME = "http", [string]$AEM_HOST = "localhost", [string]$AEM_PORT = "4502", [string]$AEM_USERNAME = "admin", [string]$AEM_PASSWORD = "admin", - [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean install -P autoInstallPackage -D""aem.port=$AEM_PORT"" -D""aem.host=$AEM_HOST"" -D""aem.username=$AEM_USERNAME"" -D""aem.password=$AEM_PASSWORD"" -D""aem.scheme=$AEM_SCHEME"" " - + [string]$MVN_COMMAND = "mvn -DskipTests -e -U -P autoInstallPackage clean install -D""aem.port=$AEM_PORT"" -D""aem.host=$AEM_HOST"" -D""aem.username=$AEM_USERNAME"" -D""aem.password=$AEM_PASSWORD"" -D""aem.scheme=$AEM_SCHEME"" ", + [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1" ) -. "..\scripts\functions.ps1" +$SKIP_CONFIG = $true +$PARENT_PROJECT_PATH = ".." -printSectionBanner "Deploying:" "warn" -printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***") +. ([Scriptblock]::Create((([System.Text.Encoding]::ASCII).getString((Invoke-WebRequest -Uri "${FUNCTIONS_URI}").Content)))) +$script:LOG_PATH = $LOG_PATH +$script:TEST_SELENIUM_URL = $TEST_SELENIUM_URL + +printSectionBanner "Deploying Monolith Package" +printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***") #update host if ( $TEST_HOST -eq "localhost" ) diff --git a/aemdesign-aem-common/filevault-export.ps1 b/aemdesign-aem-common/filevault-export.ps1 index d6dbc5295..d899f6361 100644 --- a/aemdesign-aem-common/filevault-export.ps1 +++ b/aemdesign-aem-common/filevault-export.ps1 @@ -18,9 +18,10 @@ [string]$CONTENT_DESTINATION = (Resolve-Path -Path ".\src\main\content" -Relative), [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml", [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF", - [string[]]$ROOT_PATHS, [switch]$Silent = $false, - [string]$LOG_PATH = "..\logs" + [string]$LOG_PATH = "..\logs", + [Parameter(Position=0)] + [string[]]$ROOT_PATHS ) Function Format-XMLIndent @@ -76,6 +77,10 @@ if (-not($ROOT_PATHS)) { $ROOT_PATHS = GetFilterList } +Write-Output "---------------------------------------------------" +Write-Output "------- EXPORT CONTENT FROM AN AEM INSTANCE ----------" +Write-Output "---------------------------------------------------" +Write-Output "" Write-Output "------- CONFIG ----------" Write-Output "AEM_SCHEMA: $AEM_SCHEMA" Write-Output "AEM_HOST: $AEM_HOST" diff --git a/aemdesign-aem-common/filevault-import.ps1 b/aemdesign-aem-common/filevault-import.ps1 index 88638cd0b..950b7cf18 100644 --- a/aemdesign-aem-common/filevault-import.ps1 +++ b/aemdesign-aem-common/filevault-import.ps1 @@ -20,8 +20,6 @@ [string]$CONTENT_DESTINATION = ".\src\main\content", [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml", [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF", - #which filter paths to import - [string[]]$ROOT_PATHS, [string]$ROOT_PATH = "/", [string]$CONTENT_SOURCE = (Resolve-Path -Path "src\main\content\jcr_root" -Relative), # connection timeout @@ -41,7 +39,10 @@ "action"="start" }, [switch]$Silent = $false, - [string]$LOG_PATH = "..\logs" + [string]$LOG_PATH = "..\logs", + #which filter paths to import + [Parameter(Position=0)] + [string[]]$ROOT_PATHS ) @@ -129,6 +130,10 @@ function doSlingPost { } +Write-Output "---------------------------------------------------" +Write-Output "------- IMPORT CONTENT TO AN AEM INSTANCE ----------" +Write-Output "---------------------------------------------------" +Write-Output "" Write-Output "------- CONFIG ----------" Write-Output "AEM_SCHEMA: $AEM_SCHEMA" Write-Output "AEM_HOST: $AEM_HOST" diff --git a/aemdesign-aem-common/package.ps1 b/aemdesign-aem-common/package.ps1 index fb8b4b7b9..08c19adaa 100644 --- a/aemdesign-aem-common/package.ps1 +++ b/aemdesign-aem-common/package.ps1 @@ -1,17 +1,24 @@ Param( - [string]$LOG_PATH = "${PWD}\logs", - [string]$LOG_PEFIX = "deploy", + [string]$LOG_PATH = "..\logs", + [string]$LOG_PEFIX = "package", [string]$LOG_SUFFIX = ".log", - [string]$DOCKER_LOGS_FOLDER = "${PWD}\logs\docker", + [string]$DOCKER_LOGS_FOLDER = "..\logs\docker", [string]$AEM_SCHEME = "http", [string]$AEM_HOST = "localhost", [string]$AEM_PORT = "4502", [string]$AEM_USERNAME = "admin", [string]$AEM_PASSWORD = "admin", - [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean package " + [string]$MVN_COMMAND = "mvn -D""vault.useProxy=false"" -DskipTests clean package ", + [string]$FUNCTIONS_URI = "https://github.com/aem-design/aemdesign-docker/releases/latest/download/functions.ps1" ) -. "..\scripts\functions.ps1" +$SKIP_CONFIG = $true +$PARENT_PROJECT_PATH = ".." + +. ([Scriptblock]::Create((([System.Text.Encoding]::ASCII).getString((Invoke-WebRequest -Uri "${FUNCTIONS_URI}").Content)))) + +$script:LOG_PATH = $LOG_PATH +$script:TEST_SELENIUM_URL = $TEST_SELENIUM_URL printSectionBanner "Creating Package" printSectionLine ("$MVN_COMMAND" -replace "$AEM_PASSWORD", "***") diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml index d630db27e..7accf8d59 100755 --- a/aemdesign-aem-common/pom.xml +++ b/aemdesign-aem-common/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.1.306 + 2.1.321 ../pom.xml @@ -17,7 +17,7 @@ aemdesign-aem-common - 2.1.306 + 2.1.321 content-package AEM Design - Core - AEM Common AEM.Design components and base templates @@ -145,7 +145,6 @@ commons-io commons-io - 2.5 junit @@ -190,7 +189,7 @@ org.apache.sling org.apache.sling.api - 2.2.0 + 2.22.0 provided diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-coralui-cfe/css/cf-editor.css b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-coralui-cfe/css/cf-editor.css index c5a0372db..869c0f86e 100644 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-coralui-cfe/css/cf-editor.css +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-coralui-cfe/css/cf-editor.css @@ -3,27 +3,34 @@ /* start counter for every text area */ .paragraphcounter { counter-reset: cf-rte-par-counter; + counter-set: cf-rte-par-counter -1; } /* increment counter every par block and add counter */ +.paragraphcounter > h1:before, +.paragraphcounter > h2:before, +.paragraphcounter > h3:before, .paragraphcounter > p:before { - counter-increment: cf-rte-par-counter; - content: "#" counter(cf-rte-par-counter) ""; - float: right; - color: black; - background-color: lightgray; - width: 40px; - text-align: center; - border-radius: 100%; - vertical-align: middle; - opacity: .5; + counter-increment: cf-rte-par-counter; + content: "#" counter(cf-rte-par-counter) ""; + float: right; + color: black; + background-color: lightgray; + width: 40px; + text-align: center; + border-radius: 100%; + vertical-align: middle; + opacity: .5; } /* highlight every par block */ +.paragraphcounter > h1:before, +.paragraphcounter > h2:before, +.paragraphcounter > h3:before, .paragraphcounter > p { - border: 1px dashed rgba(0, 0, 0, .5); + border: 1px dashed rgba(0, 0, 0, .5); } diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/analytics/datalayer/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/redirectnotification/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/staticinclude/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/common/timing/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contenttemplate/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/download/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/embedsource/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/external/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/link/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pageauthor/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedate/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagedescription/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetags/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/pagetitle/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/reference/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/table/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/text/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/tooltip/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/form/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/form/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/common/form/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/datasources/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/renderconditions/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/renderconditions/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/renderconditions/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/assetoptions/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/assetoptions/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/coral/widgets/form/assetoptions/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v3/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v3/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/event-details/v3/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml index 30bbd32c2..09aacf213 100644 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_dialog/.content.xml @@ -98,6 +98,11 @@ variant="valuelist" path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/components/details/generic-details/templates"/> + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml index 671f3100d..67ec8de5f 100755 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/_cq_editConfig.xml @@ -1,9 +1,15 @@ - + - + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v3/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v3/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/location-details/v3/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/news-details/v3/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/page-details/v3/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/button/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/button/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/button/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/form/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/form/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/form/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/hidden/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/hidden/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/hidden/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/options/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/options/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/options/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/text/v1/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/text/v1/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/forms/text/v1/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/article/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/aside/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/breadcrumb/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/colctrl/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml index 3f76eff0c..0df742194 100755 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/.content.xml @@ -1,9 +1,10 @@ - + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/.content.xml index 46a193d0c..f2f630a5e 100755 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/.content.xml +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/.content.xml @@ -1,10 +1,10 @@ diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/clientlibs/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/clientlibs/.content.xml index c68120c9f..1a869069d 100755 --- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/clientlibs/.content.xml +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/clientlibs/.content.xml @@ -1,5 +1,5 @@ + jcr:primaryType="cq:ClientLibraryFolder" + allowProxy="{Boolean}true" + categories="[aemdesign.components.author,aemdesign.components.publish,aemdesign.components.contentblock]"/> diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/.content.xml new file mode 100644 index 000000000..54084a826 --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblock/v2/.content.xml @@ -0,0 +1,4 @@ + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblocklock/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contentblockmenu/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/contenttabs/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/footer/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/header/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/navbar/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/assetlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/contactlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/eventlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/langnav/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/langnav/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/langnav/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/list/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/listnav/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/locationlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/navlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/newslist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/pagelist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/searchlist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/lists/taglist/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/audio/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/image/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/media/video/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/columns/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/columns/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/reports/report-builder/columns/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/addthisconnect/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/addthisconnect/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/addthisconnect/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googleanalytics/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googleanalytics/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googleanalytics/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googlemap/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googlemap/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/cloudconfig/googlemap/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/one/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/one/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/one/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/three/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/three/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/three/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/two/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/two/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/column/two/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/common/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/common/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/common/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/template/experience-fragments/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/addthis/sharebutton/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/onlinemedia/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/search/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/widgets/vue/v2/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/README.md b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/README.md new file mode 100644 index 000000000..9cf78103a --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/README.md @@ -0,0 +1,27 @@ +Content Fragment Page Generation +============ + +Content Fragment Page Generation + +# Overview + +Generate Pages for Content Fragments + +## Information +* **Vendor**: [AEM.Design](http://aem.design) +* **Version**: v2 +* **Compatibility**: AEM 6.4+ +* **Status**: production-ready +* **Local Code**: [/apps/aemdesign/components/content/text/v2/text](/crx/de/#/apps/aemdesign/components/workflow/contentfragmentpagegen) +* **Source**: [github/aem-design](https://github.com/aem-design/aemdesign-aem-common/tree/master/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen) +* **Readme**: [/apps/aemdesign/components/content/text/v2/text](/mnt/overlay/wcm/core/content/sites/components/details.html/apps/aemdesign/components/workflow/contentfragmentpagegen) + +# Authoring + +Add this component to your workflow to generate pages from content fragments. + + + + + +

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/templates/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/templates/.content.xml new file mode 100644 index 000000000..329e888aa --- /dev/null +++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/templates/.content.xml @@ -0,0 +1,5 @@ + + + diff --git a/aemdesign-aem-common/watch b/aemdesign-aem-common/watch deleted file mode 100755 index 11d661340..000000000 --- a/aemdesign-aem-common/watch +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -function set_term_title() { - echo -en "\033]0;$1\a" -} - -function lowercase() { - #echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/" - echo "$1" | awk '{print tolower($0)}' -} - -function getOS() { - OS=$(lowercase "$(uname -a | grep Microsoft -q && echo windowsnt || uname)") - echo "OS=${OS}" -} - -function main() { - getOS - - if [[ "$OS" == "windowsnt" || "$OS" == *"mingw"* || "$OS" == *"cygwin"* ]]; then - OS=windows - if [[ "false" == "$(which watch && echo true || echo false)" ]]; then - echo "You need to install 'procps-ng' package" - else - # shellcheck disable=SC2050 - while [ "1" == "1" ]; - do - set_term_title "Monitoring changes" - #TODO: does this work? - watch -g -t -d ls -lR - ./deploy - set_term_title "Up-to-date" - sleep 1 - done - - fi - - ./deploy - - elif [ "$OS" == "linux" ]; then - OS=linux - - if [[ "false" == "$(which inotifywait && echo true || echo false)" ]]; then - echo "You need to install 'inotify-tools'" - else - # shellcheck disable=SC2050 - while [ "1" == "1" ]; - do - set_term_title "Monitoring changes" - inotifywait -e modify -e create -r ./* - ./deploy - set_term_title "Up-to-date" - sleep 1 - done - fi - - elif [ "$OS" == "darwin" ]; then - OS="mac" - - if [[ "false" == "$(which fswatch && echo true || echo false)" ]]; then - echo "Install FSWatch install https://github.com/wildone/fswatch" - else - # shellcheck disable=SC2050 - while [ "1" == "1" ]; - do - set_term_title "Monitoring changes" - fswatch --silent --quit --ignore .DS_Store:.idea:.git:.iml --p . - ./deploy - set_term_title "Up-to-date" - sleep 1 - done - - fi - - - fi - -} - -#start -main "$@"; diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml index 4455dbdf1..79fe86f99 100644 --- a/aemdesign-aem-core-deploy/pom.xml +++ b/aemdesign-aem-core-deploy/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.1.306 + 2.1.321 ../pom.xml @@ -20,7 +20,7 @@ content-package AEM Design - Core - Deployment Package AEM.Design deployment package for all packages - 2.1.306 + 2.1.321 https://aem.design diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml index 4ef74fffa..a263c67a7 100755 --- a/aemdesign-aem-services/pom.xml +++ b/aemdesign-aem-services/pom.xml @@ -9,7 +9,7 @@ design.aem aemdesign-aem-core - 2.1.306 + 2.1.321 ../pom.xml @@ -18,7 +18,7 @@ aemdesign-aem-services - 2.1.306 + 2.1.321 jar AEM Design - Core - AEM Services Project for all AEM and OSGI Services @@ -758,6 +758,7 @@ com.akamai.edgegrid.signer.* commons-codec commons-codec 1.13 + compile diff --git a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java index bb9c70230..ab545ed37 100644 --- a/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java +++ b/aemdesign-aem-services/src/main/java/design/aem/utils/components/CommonUtil.java @@ -53,15 +53,20 @@ public class CommonUtil { public static final String COMPONENT_DETAILS_SUFFIX = "-details"; public static final String PATH_DEFAULT_CONTENT = "article/par"; public static final String PATH_DEFAULT_CONTENT_BASIC = "root/responsivegrid"; + public static final String PATH_DEFAULT_CONTENT_BASIC_CORE = "root/container"; public static final String PATH_DEFAULT_CONTENT_ROOT_ARTICLE = "root/article/par"; public static final String DEFAULT_PAR_NAME = "par"; + public static final String DEFAULT_ROOT_NAME = "root"; public static final String[] DEFAULT_LIST_DETAILS_SUFFIX = new String[]{COMPONENT_DETAILS_SUFFIX}; //NOSONAR used by models + //TODO: need to make this an OSGi Config same as aemdesign.components.media.image public static final String[] DEFAULT_LIST_PAGE_CONTENT = new String[]{ - DEFAULT_PAR_NAME, + PATH_DEFAULT_CONTENT_BASIC_CORE, // vanila core on sdk + DEFAULT_ROOT_NAME, + DEFAULT_PAR_NAME, //legacy PATH_DEFAULT_CONTENT, PATH_DEFAULT_CONTENT_BASIC, - PATH_DEFAULT_CONTENT_ROOT_ARTICLE + PATH_DEFAULT_CONTENT_ROOT_ARTICLE //semantic }; //NOSONAR used by models diff --git a/pom.xml b/pom.xml index 19e51cc66..92ded8e42 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ design.aem aemdesign-aem-core - 2.1.306 + 2.1.321 pom AEM Design - Core Project @@ -216,7 +216,7 @@ commons-io commons-io - 2.5 + 2.8.0 provided @@ -397,15 +397,16 @@ org.apache.sling org.apache.sling.api - 2.16.2 + 2.16.4 provided org.apache.sling org.apache.sling.jcr.api - 2.1.0 + 2.4.0 provided +