From de69fb29d81455028068c9e3c3e3403b32cc47b3 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 8 Sep 2023 17:56:05 +0200 Subject: [PATCH 01/24] [gitflow-maven-plugin] Update for next development version 3.8.5-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca09afec..0e3f3ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ io.wcm.maven.archetypes io.wcm.maven.archetypes.aem - 3.8.4 + 3.8.5-SNAPSHOT maven-archetype wcm.io Maven Archetype for AEM From 2ce3802a2ff2c38d0d9cdeb13e50cd541d4af38d Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 12 Sep 2023 14:09:07 +0200 Subject: [PATCH 02/24] update dependency --- changes.xml | 6 ++++++ src/main/resources/archetype-resources/parent/pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes.xml b/changes.xml index a959daad..ea9b42e5 100644 --- a/changes.xml +++ b/changes.xml @@ -23,6 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> + + + Update dependencies. + + + wcm.io Site API Generic Edit. diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index d3c2ef3d..acc7694c 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -313,7 +313,7 @@ io.wcm io.wcm.testing.wcm-io-mock.site-api.generic-edit - 1.0.0 + 1.0.1-SNAPSHOT io.wcm From 6a83ef5cef943dbfc40a41118726d0276235e56d Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 13 Sep 2023 10:13:45 +0200 Subject: [PATCH 03/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index acc7694c..494659fd 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -226,7 +226,7 @@ io.wcm io.wcm.site-api.generic-edit - 1.0.0 + 1.0.2 io.wcm @@ -313,7 +313,7 @@ io.wcm io.wcm.testing.wcm-io-mock.site-api.generic-edit - 1.0.1-SNAPSHOT + 1.0.0 io.wcm From 07e5d788dc1d2cd49e0a14d626f52b430573c02a Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Fri, 15 Sep 2023 10:11:05 +0200 Subject: [PATCH 04/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 494659fd..4a7cce80 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -35,7 +35,7 @@ 2.23.2 #end #if( $optionAcsCommons == "y" ) - 6.0.14 + 6.2.0 #end From 850fdfcbc77682a4d1937f61f452494badcf0aea Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 18 Sep 2023 10:25:28 +0200 Subject: [PATCH 05/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 4a7cce80..56dff020 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.6 + 2.1.8 From cdda80ff3f5c81a0023e9a5b7045e692124eb4bf Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 17 Oct 2023 10:35:28 +0200 Subject: [PATCH 06/24] update dependencies --- src/main/resources/archetype-resources/parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 56dff020..09d0676a 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -132,7 +132,7 @@ io.wcm io.wcm.caconfig.extensions #if ( $optionContextAwareConfigLatest == "y" || $optionAemVersion == "cloud" ) - 1.9.2 + 1.9.4 #else 1.8.8 @@ -245,7 +245,7 @@ io.wcm io.wcm.testing.aem-mock.junit5 - 5.3.0 + 5.4.0 #if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) From 6208b091798a3c2f338294b4c06963b7eadebd4a Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 17 Oct 2023 11:05:47 +0200 Subject: [PATCH 07/24] Add Java 21 build Update to checkout@v4 --- .github/workflows/maven-build.yml | 4 ++-- .github/workflows/maven-deploy.yml | 2 +- .github/workflows/release-from-tag.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index f04289bb..f40c8859 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -19,7 +19,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - java: [11, 17] + java: [11, 17, 21] os: [ubuntu-latest] distribution: [temurin] include: @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK uses: actions/setup-java@v3 diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml index a16f98b8..83c03ac8 100644 --- a/.github/workflows/maven-deploy.yml +++ b/.github/workflows/maven-deploy.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Configure GIT run: | diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml index 98688835..c722ed73 100644 --- a/.github/workflows/release-from-tag.yml +++ b/.github/workflows/release-from-tag.yml @@ -12,7 +12,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ncipollo/release-action@v1 with: body: 'Changes: https://wcm.io/tooling/maven/archetypes/aem/changes-report.html' From a5b371b7e444685239994b8a7ec33ee92c3a2642 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 17 Oct 2023 11:44:09 +0200 Subject: [PATCH 08/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 09d0676a..f467153b 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.8 + 2.1.9-SNAPSHOT From 446bca331bd8f5c055ac6d45eb061dc5c1f9b2a2 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 17 Oct 2023 11:48:41 +0200 Subject: [PATCH 09/24] update dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e3f3ddd..fc659fbd 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.maven io.wcm.maven.parent - 2.1.0 + 2.1.1-SNAPSHOT From e83f6cf8d09279ffc90cd7c4d76320f0ed09d1c4 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 18 Oct 2023 14:02:51 +0200 Subject: [PATCH 10/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index f467153b..d3fd1925 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.9-SNAPSHOT + 2.1.10 From af716a43a1afaf50058595c35d8db66220f3c4ca Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Nov 2023 11:52:18 +0100 Subject: [PATCH 11/24] update dependencies --- src/main/resources/archetype-resources/parent/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index d3fd1925..99831a4c 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.10 + 2.1.11-SNAPSHOT @@ -376,11 +376,11 @@ org.junit junit-bom - 5.10.0 + 5.10.1 pom import -#set( $mockitoVersion = "5.5.0" ) +#set( $mockitoVersion = "5.7.0" ) org.mockito mockito-core @@ -409,7 +409,7 @@ com.adobe.cq aem-cloud-testing-clients - 1.2.0 + 1.2.1 #end #if ( $optionWcmioSiteApi == "y" ) From 2790f8cd7ad68929f2d4695d498126d64b95ad20 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Nov 2023 11:57:14 +0100 Subject: [PATCH 12/24] update dependencies --- src/main/resources/archetype-resources/parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index 99831a4c..abd587a7 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -141,7 +141,7 @@ io.wcm io.wcm.caconfig.editor - 1.15.6 + 1.15.7-SNAPSHOT io.wcm @@ -173,7 +173,7 @@ io.wcm io.wcm.wcm.ui.clientlibs - 1.2.2 + 1.2.3-SNAPSHOT io.wcm @@ -245,7 +245,7 @@ io.wcm io.wcm.testing.aem-mock.junit5 - 5.4.0 + 5.4.1-SNAPSHOT #if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) From 37dbb258ba3d30fd0d747349b051928b63592fad Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Nov 2023 13:55:02 +0100 Subject: [PATCH 13/24] update dependency --- src/main/resources/archetype-resources/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index abd587a7..d5f5a471 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -5,7 +5,7 @@ io.wcm.maven io.wcm.maven.aem-global-parent - 2.1.11-SNAPSHOT + 2.1.12 From 2c4b3693a855f0fbf8117f981ca0c0213cad1551 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 20 Nov 2023 14:58:39 +0100 Subject: [PATCH 14/24] update parent dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc659fbd..2ae202d8 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ io.wcm.maven io.wcm.maven.parent - 2.1.1-SNAPSHOT + 2.1.2 From 3ebc54ebfc559c41d53e6ab5acfeee96d643edbb Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 21 Nov 2023 09:39:24 +0100 Subject: [PATCH 15/24] update dependencies --- src/main/resources/archetype-resources/parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index d5f5a471..c24c54e6 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -173,7 +173,7 @@ io.wcm io.wcm.wcm.ui.clientlibs - 1.2.3-SNAPSHOT + 1.3.0 io.wcm @@ -245,7 +245,7 @@ io.wcm io.wcm.testing.aem-mock.junit5 - 5.4.1-SNAPSHOT + 5.4.2 #if ( $optionAemVersion == "6.5" && ($optionAemServicePack=="y" || $optionAemServicePackAPI=="y") ) From fab364f53d7ca0f5af8737b9e523f1367fb69f51 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 22 Nov 2023 15:39:37 +0100 Subject: [PATCH 16/24] update dependencies --- src/main/resources/archetype-resources/parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml index c24c54e6..a74fd6e7 100644 --- a/src/main/resources/archetype-resources/parent/pom.xml +++ b/src/main/resources/archetype-resources/parent/pom.xml @@ -141,7 +141,7 @@ io.wcm io.wcm.caconfig.editor - 1.15.7-SNAPSHOT + 1.15.8 io.wcm @@ -168,7 +168,7 @@ io.wcm io.wcm.wcm.ui.granite - 1.9.14 + 1.10.0 io.wcm From 5086452e56dfb90de6277f5322b3e8b3f4e237e9 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 Nov 2023 12:33:22 +0100 Subject: [PATCH 17/24] java 8 no longer supported --- src/site/markdown/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 66d4261a..1f6ceaa4 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -19,7 +19,7 @@ The wcm.io Maven Archetype for AEM allows you to set up new Maven projects for d Features: * Supports AEM 6.5 (with latest service pack) and AEM as a Cloud Service (AEMaaCS) -* Supports Java 8 and Java 11 +* Supports Java 11 * Unit Tests based on JUnit 5 and [AEM Mocks][aem-mock] * Supports both Sling-Initial-Content JSON-style project layout and FileVault package layout * Based on [CONGA][conga] to manage AEM configuration and package deployment From d17777f6fa439f52732f891317a9219dacce4110 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 27 Nov 2023 12:51:26 +0100 Subject: [PATCH 18/24] Remove Site API options (#35) --- changes.xml | 3 + .../META-INF/archetype-post-generate.groovy | 63 +--- .../META-INF/maven/archetype-metadata.xml | 38 --- .../archetype-resources/archetype.properties | 1 - .../archetype-resources/bundles/core/pom.xml | 50 --- .../config/impl/LinkHandlerConfigImpl.java | 34 -- .../main/java/reference/LinkReference.java | 61 ---- .../main/java/reference/MediaReference.java | 48 --- .../impl/LinkReferenceDecorator.java | 26 -- .../impl/MediaReferenceDecorator.java | 26 -- .../container/accordion/accordion.html | 3 - .../container/carousel/carousel.html | 3 - .../components/container/tabs/tabs.html | 3 - .../components/content/button/button.html | 3 - .../contentfragment/contentfragment.html | 3 - .../contentfragmentlist.html | 3 - .../customcarousel/customcarousel.html | 4 - .../components/content/download/download.html | 3 - .../components/content/embed/embed.html | 3 - .../experiencefragment.html | 3 - .../components/content/list/list.html | 3 - .../content/pdfviewer/pdfviewer.html | 3 - .../content/progressbar/progressbar.html | 3 - .../components/content/teaser/teaser.html | 3 - .../global/page/customfooterlibs.html | 2 - .../global/page/customheaderlibs.html | 7 - .../global/xfpage/customfooterlibs.html | 2 - .../global/xfpage/customheaderlibs.html | 7 - .../java/reference/LinkReferenceTest.java | 70 ---- .../java/reference/MediaReferenceTest.java | 55 --- .../test/java/testcontext/AppAemContext.java | 20 +- .../bundles/site-api-spec/README.md | 30 -- .../bundles/site-api-spec/index.html | 10 - .../bundles/site-api-spec/package.json | 23 -- .../bundles/site-api-spec/pom.xml | 48 --- .../bundles/site-api-spec/src/index.js | 15 - .../site-api-spec/src/spec/site-api.yaml | 314 ------------------ .../SpecificationValidationTest.java | 34 -- .../bundles/site-api-spec/webpack.config.js | 52 --- .../config-definition/pom.xml | 24 -- .../src/main/environments/cloud.yaml | 20 -- .../main/roles/__projectName__-aem-cms.yaml | 12 - ...jectName__-aem-cms-config.provisioning.hbs | 32 +- .../container/accordion/accordion.html | 3 - .../container/carousel/carousel.html | 3 - .../core/components/container/tabs/tabs.html | 3 - .../components/content/button/button.html | 3 - .../contentfragment/contentfragment.html | 3 - .../contentfragmentlist.html | 3 - .../customcarousel/customcarousel.html | 4 - .../components/content/download/download.html | 3 - .../core/components/content/embed/embed.html | 3 - .../experiencefragment.html | 3 - .../core/components/content/list/list.html | 3 - .../content/pdfviewer/pdfviewer.html | 3 - .../content/progressbar/progressbar.html | 3 - .../components/content/teaser/teaser.html | 3 - .../global/page/customfooterlibs.html | 2 - .../global/page/customheaderlibs.html | 7 - .../global/xfpage/customfooterlibs.html | 2 - .../global/xfpage/customheaderlibs.html | 7 - .../archetype-resources/parent/pom.xml | 62 ---- .../tests/integration/pom.xml | 26 +- .../src/main/java/it/siteapi/Constants.java | 51 --- .../it/siteapi/ContentPageReplicationIT.java | 169 ---------- .../java/it/siteapi/CrawlAndValidateIT.java | 108 ------ .../java/it/siteapi/rules/CustomPageRule.java | 34 -- src/site/markdown/index.md | 3 +- src/site/markdown/usage.md.vm | 52 +-- .../archetype.properties | 2 - .../goal.txt | 0 .../archetype.properties | 2 - .../archetype.properties | 2 - .../goal.txt | 0 .../archetype.properties | 2 - .../archetype.properties | 2 - .../goal.txt | 0 .../archetype.properties | 2 - .../archetype.properties | 2 - .../goal.txt | 0 .../archetype.properties | 2 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 2 - .../goal.txt | 0 .../archetype.properties | 2 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 2 - .../archetype.properties | 2 - .../archetype.properties | 28 -- .../goal.txt | 1 - .../archetype.properties | 28 -- .../goal.txt | 1 - 110 files changed, 23 insertions(+), 1985 deletions(-) delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/java/reference/LinkReference.java delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/java/reference/MediaReference.java delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/LinkReferenceDecorator.java delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/MediaReferenceDecorator.java delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/accordion/accordion.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/carousel/carousel.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/tabs/tabs.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/button/button.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragment/contentfragment.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragmentlist/contentfragmentlist.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/download/download.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/embed/embed.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/experiencefragment/experiencefragment.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/list/list.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/pdfviewer/pdfviewer.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/progressbar/progressbar.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/teaser/teaser.html delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/test/java/reference/LinkReferenceTest.java delete mode 100644 src/main/resources/archetype-resources/bundles/core/src/test/java/reference/MediaReferenceTest.java delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/README.md delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/index.html delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/package.json delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/pom.xml delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/src/index.js delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/src/spec/site-api.yaml delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/src/test/java/siteapispec/SpecificationValidationTest.java delete mode 100644 src/main/resources/archetype-resources/bundles/site-api-spec/webpack.config.js delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/container/accordion/accordion.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/container/carousel/carousel.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/container/tabs/tabs.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/button/button.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/contentfragment/contentfragment.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/contentfragmentlist/contentfragmentlist.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/download/download.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/embed/embed.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/experiencefragment/experiencefragment.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/list/list.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/pdfviewer/pdfviewer.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/progressbar/progressbar.html delete mode 100644 src/main/resources/archetype-resources/content-packages/ui.apps/jcr_root/apps/__projectName__/core/components/content/teaser/teaser.html delete mode 100644 src/main/resources/archetype-resources/tests/integration/src/main/java/it/siteapi/Constants.java delete mode 100644 src/main/resources/archetype-resources/tests/integration/src/main/java/it/siteapi/ContentPageReplicationIT.java delete mode 100644 src/main/resources/archetype-resources/tests/integration/src/main/java/it/siteapi/CrawlAndValidateIT.java delete mode 100644 src/main/resources/archetype-resources/tests/integration/src/main/java/it/siteapi/rules/CustomPageRule.java rename src/test/resources/projects-github/{alpha65-json-wcmio-caconfig-acscommons => alpha65-json-wcmio-caconfig-acscommons-sp}/archetype.properties (92%) rename src/test/resources/projects-github/{alpha65-json-wcmio-caconfig-acscommons => alpha65-json-wcmio-caconfig-acscommons-sp}/goal.txt (100%) rename src/test/resources/projects-github/{beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend => beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp}/archetype.properties (92%) rename src/test/resources/projects-github/{beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend => beta65-json-wcmio-editableTpl-caconfig-multibundle-frontend-sp}/goal.txt (100%) rename src/test/resources/projects-github/{delta65-filevault-editableTpl-caconfig-frontend => delta65-filevault-editableTpl-caconfig-frontend-sp}/archetype.properties (92%) rename src/test/resources/projects-github/{delta65-filevault-editableTpl-caconfig-frontend => delta65-filevault-editableTpl-caconfig-frontend-sp}/goal.txt (100%) rename src/test/resources/projects-github/{epsilon65-filevault-editableTpl => epsilon65-filevault-editableTpl-sp}/archetype.properties (92%) rename src/test/resources/projects-github/{epsilon65-filevault-editableTpl => epsilon65-filevault-editableTpl-sp}/goal.txt (100%) delete mode 100644 src/test/resources/projects-github/eta65-json-wcmio-editableTpl-caconfig-siteapi-genericedit/archetype.properties delete mode 100644 src/test/resources/projects-github/eta65-json-wcmio-editableTpl-caconfig-siteapi-genericedit/goal.txt delete mode 100644 src/test/resources/projects-github/etaCloud-json-wcmio-editableTpl-caconfig-siteapi-genericedit/archetype.properties delete mode 100644 src/test/resources/projects-github/etaCloud-json-wcmio-editableTpl-caconfig-siteapi-genericedit/goal.txt rename src/test/resources/projects-github/{gamma65-filevault-wcmio-caconfig => gamma65-filevault-wcmio-caconfig-sp}/archetype.properties (92%) rename src/test/resources/projects-github/{gamma65-filevault-wcmio-caconfig => gamma65-filevault-wcmio-caconfig-sp}/goal.txt (100%) delete mode 100644 src/test/resources/projects-github/zeta65-json-wcmio-editableTpl-caconfig-siteapi/archetype.properties delete mode 100644 src/test/resources/projects-github/zeta65-json-wcmio-editableTpl-caconfig-siteapi/goal.txt delete mode 100644 src/test/resources/projects-github/zetaCloud-json-wcmio-editableTpl-caconfig-siteapi/archetype.properties delete mode 100644 src/test/resources/projects-github/zetaCloud-json-wcmio-editableTpl-caconfig-siteapi/goal.txt delete mode 100644 src/test/resources/projects/eta65-json-wcmio-editableTpl-caconfig-siteapi-genericedit-sp/archetype.properties delete mode 100644 src/test/resources/projects/eta65-json-wcmio-editableTpl-caconfig-siteapi-genericedit-sp/goal.txt delete mode 100644 src/test/resources/projects/etaCloud-json-wcmio-editableTpl-caconfig-siteapi-genericedit/archetype.properties delete mode 100644 src/test/resources/projects/etaCloud-json-wcmio-editableTpl-caconfig-siteapi-genericedit/goal.txt delete mode 100644 src/test/resources/projects/zeta65-json-wcmio-editableTpl-caconfig-siteapi-sp/archetype.properties delete mode 100644 src/test/resources/projects/zeta65-json-wcmio-editableTpl-caconfig-siteapi-sp/goal.txt delete mode 100644 src/test/resources/projects/zetaCloud-json-wcmio-editableTpl-caconfig-siteapi/archetype.properties delete mode 100644 src/test/resources/projects/zetaCloud-json-wcmio-editableTpl-caconfig-siteapi/goal.txt diff --git a/changes.xml b/changes.xml index ea9b42e5..4fa83b00 100644 --- a/changes.xml +++ b/changes.xml @@ -27,6 +27,9 @@ Update dependencies. + + Remove Site API options. + diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy index 3366f036..6061d766 100644 --- a/src/main/resources/META-INF/archetype-post-generate.groovy +++ b/src/main/resources/META-INF/archetype-post-generate.groovy @@ -7,7 +7,6 @@ import groovy.util.XmlSlurper def rootDir = new File(request.getOutputDirectory() + "/" + request.getArtifactId()) def javaPackage = request.getProperties().get("package") -def javaPackagePath = javaPackage.replace('.','/') def optionAemVersion = request.getProperties().get("optionAemVersion") def optionAemServicePack = request.getProperties().get("optionAemServicePack") def optionAemServicePackAPI = request.getProperties().get("optionAemServicePackAPI") @@ -16,13 +15,10 @@ def optionEditableTemplates = request.getProperties().get("optionEditableTemplat def optionMultiBundleLayout = request.getProperties().get("optionMultiBundleLayout") def optionContextAwareConfig = request.getProperties().get("optionContextAwareConfig") def optionWcmioHandler = request.getProperties().get("optionWcmioHandler") -def optionWcmioSiteApi = request.getProperties().get("optionWcmioSiteApi") -def optionWcmioSiteApiGenericEdit = request.getProperties().get("optionWcmioSiteApiGenericEdit") def optionIntegrationTests = request.getProperties().get("optionIntegrationTests") def coreBundle = new File(rootDir, "bundles/core") def clientlibsBundle = new File(rootDir, "bundles/clientlibs") -def siteApiSpecBundle = new File(rootDir, "bundles/site-api-spec") def completeContentPackage = new File(rootDir, "content-packages/complete") def confContentPackage = new File(rootDir, "content-packages/conf-content") def sampleContentPackage = new File(rootDir, "content-packages/sample-content") @@ -32,7 +28,6 @@ def frontend = new File(rootDir, "frontend") def rootPom = new File(rootDir, "pom.xml") def parentPom = new File(rootDir, "parent/pom.xml") def tests = new File(rootDir, "tests") -def integrationTests = new File(rootDir, "tests/integration") // validate parameters - throw exceptions for invalid combinations if ((optionAemServicePack=="y" || optionAemServicePackAPI=="y") && optionAemVersion == "cloud") { @@ -50,15 +45,6 @@ if (optionWcmioHandler == "y" && optionContextAwareConfig == "n") { if (optionEditableTemplates == "n" && optionWcmioHandler == "n") { throw new RuntimeException("You have to specify either parameter optionEditableTemplates='y' or optionWcmioHandler='y'.") } -if (optionWcmioSiteApi == "y" && optionWcmioHandler == "n") { - throw new RuntimeException("Parameter optionSiteApi='y' is only supported with optionWcmioHandler='y'.") -} -if (optionWcmioSiteApiGenericEdit == "y" && optionWcmioSiteApi == "n") { - throw new RuntimeException("Parameter optionWcmioSiteApiGenericEdit='y' is only supported with optionWcmioSiteApi='y'.") -} -if (optionWcmioSiteApiGenericEdit == "y" && optionFrontend == "y") { - throw new RuntimeException("Parameter optionWcmioSiteApiGenericEdit='y' is not allowed together with optionFrontend='y'.") -} if (!(javaPackage ==~ /^[a-z0-9\.]+$/)) { throw new RuntimeException("Java package name is invalid: " + javaPackage) } @@ -94,26 +80,18 @@ else { // remove frontend module entry from root pom removeModule(rootPom, "frontend") } -if (optionWcmioSiteApiGenericEdit == "y") { - assert clientlibsBundle.deleteDir() - assert new File(uiAppsPackage, "jcr_root/apps/${projectName}/clientlibs").deleteDir() - // remove bundles/clientlibs module entry from root pom - removeModule(rootPom, "bundles/clientlibs") -} // remove files only relevant for wcm.io Handler projects if (optionWcmioHandler == "n") { - assert new File(coreBundle, "src/main/java/${javaPackagePath}/config").deleteDir() + assert new File(coreBundle, "src/main/java/" + javaPackage.replace('.','/') + "/config").deleteDir() assert new File(coreBundle, "src/main/webapp/app-root/templates/admin/redirect").deleteDir() assert new File(coreBundle, "src/main/webapp/app-root/templates/admin/redirect.json").delete() assert new File(coreBundle, "src/main/webapp/app-root/components/admin/page/redirect.json").delete() assert new File(coreBundle, "src/main/webapp/app-root/components/content/responsiveimage.json").delete() - if (optionWcmioSiteApiGenericEdit == "n") { - assert new File(clientlibsBundle, "src/main/webapp/clientlibs-root/${projectName}.app/css").deleteDir() - assert new File(uiAppsPackage, "jcr_root/apps/${projectName}/clientlibs/${projectName}.app/css").deleteDir() - } + assert new File(clientlibsBundle, "src/main/webapp/clientlibs-root/${projectName}.app/css").deleteDir() + assert new File(uiAppsPackage, "jcr_root/apps/${projectName}/clientlibs/${projectName}.app/css").deleteDir() if (optionFrontend == "y") { assert new File(frontend, "src/components/customcarousel/customcarousel.scss").delete() @@ -132,24 +110,8 @@ else { assert new File(uiAppsPackage, "jcr_root/apps/${projectName}/core/components/admin/page/structureElement/structureElement.html").delete() } -// remove empty component HTL files -[ - new File(coreBundle, "src/main/webapp/app-root/components"), - new File(uiAppsPackage, "jcr_root/apps/${projectName}/core/component") -].each { componentsFolder -> - if (componentsFolder.exists()) { - componentsFolder.eachFileRecurse(FileType.FILES) { file -> - if (file.name =~ /\.html$/) { - if (file.getText("UTF-8").empty) { - assert file.delete() - } - } - } - } -} - // refactor project layout when multi bundle layout is switched off -if (optionMultiBundleLayout == "n" && optionWcmioSiteApiGenericEdit == "n") { +if (optionMultiBundleLayout == "n") { // move .gitignore for clientlibs-root if (optionFrontend == "y") { assert new File(clientlibsBundle, ".gitignore").renameTo(new File(coreBundle, ".gitignore")) @@ -262,27 +224,10 @@ else { assert new File(configDefinition, "src/main/environments/cloud.yaml").delete() } -if (optionWcmioSiteApi == "n") { - assert new File(coreBundle, "src/main/java/${javaPackagePath}/reference").deleteDir() - assert new File(coreBundle, "src/test/java/${javaPackagePath}/reference").deleteDir() - removeModule(rootPom, "bundles/site-api-spec") - siteApiSpecBundle.deleteDir() -} - if (optionIntegrationTests == "n") { removeModule(rootPom, "tests/integration") tests.deleteDir() } -else if (optionWcmioSiteApi == "y") { - // remove non-Site API integration test code - assert new File(integrationTests, "src/main/java/${javaPackagePath}/it/components").deleteDir() - assert new File(integrationTests, "src/main/java/${javaPackagePath}/it/rules").deleteDir() - assert new File(integrationTests, "src/main/java/${javaPackagePath}/it/tests").deleteDir() -} -else { - // remove Site API integration test code - assert new File(integrationTests, "src/main/java/${javaPackagePath}/it/siteapi").deleteDir() -} // convert all line endings to unix-style diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index d4e3c5d7..1ef7d39a 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -123,16 +123,6 @@ n ^(y|n)$ - - - n - ^(y|n)$ - - - - n - ^(y|n)$ - n @@ -272,33 +262,6 @@ - - - - src/spec - - **/*.yaml - - - - src/test/java - - **/*.java - - - - - - index.html - package.json - README.md - webpack.config.js - src/index.js - - - - - @@ -443,7 +406,6 @@ README.md - run-integration-tests-locally.sh diff --git a/src/main/resources/archetype-resources/archetype.properties b/src/main/resources/archetype-resources/archetype.properties index 25ca9130..51fa13c2 100644 --- a/src/main/resources/archetype-resources/archetype.properties +++ b/src/main/resources/archetype-resources/archetype.properties @@ -23,6 +23,5 @@ optionContextAwareConfig=${optionContextAwareConfig} optionFrontend=${optionFrontend} optionNodeJsPlugin=${optionNodeJsPlugin} optionWcmioHandler=${optionWcmioHandler} -optionWcmioSiteApi=${optionWcmioSiteApi} optionAcsCommons=${optionAcsCommons} optionIntegrationTests=${optionIntegrationTests} diff --git a/src/main/resources/archetype-resources/bundles/core/pom.xml b/src/main/resources/archetype-resources/bundles/core/pom.xml index a4e6aeaa..7b053584 100644 --- a/src/main/resources/archetype-resources/bundles/core/pom.xml +++ b/src/main/resources/archetype-resources/bundles/core/pom.xml @@ -117,30 +117,6 @@ io.wcm.wcm.ui.clientlibs compile -#if ( $optionWcmioSiteApi == "y" ) - - io.wcm - io.wcm.site-api.processor - compile - - - io.wcm - io.wcm.site-api.handler - compile - -#end -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - - io.wcm - io.wcm.site-api.generic-edit - compile - - - io.wcm - io.wcm.site-api.generic-edit.handler - compile - -#end #end @@ -204,37 +180,11 @@ io.wcm.testing.wcm-io-mock.wcm test -#if ( $optionWcmioSiteApi == "y" ) - - io.wcm - io.wcm.testing.wcm-io-mock.site-api.processor - test - -#end io.wcm io.wcm.testing.wcm-io-mock.handler test -#if ( $optionWcmioSiteApi == "y" ) - - io.wcm - io.wcm.testing.wcm-io-mock.site-api.handler - test - -#end -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - - io.wcm - io.wcm.testing.wcm-io-mock.site-api.generic-edit - test - - - io.wcm - io.wcm.testing.wcm-io-mock.site-api.generic-edit.handler - test - -#end #end diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java b/src/main/resources/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java index d106a668..77b02c2d 100644 --- a/src/main/resources/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java +++ b/src/main/resources/archetype-resources/bundles/core/src/main/java/config/impl/LinkHandlerConfigImpl.java @@ -12,23 +12,12 @@ import com.day.cq.wcm.api.Page; -#if ( $optionWcmioSiteApi == "y" ) -import io.wcm.handler.link.markup.SimpleLinkMarkupBuilder; -#end import io.wcm.handler.link.spi.LinkHandlerConfig; -#if ( $optionWcmioSiteApi == "y" ) -import io.wcm.handler.link.spi.LinkMarkupBuilder; -import io.wcm.handler.link.spi.LinkProcessor; -#end import io.wcm.handler.link.spi.LinkType; import io.wcm.handler.link.type.ExternalLinkType; import io.wcm.handler.link.type.InternalCrossContextLinkType; import io.wcm.handler.link.type.InternalLinkType; import io.wcm.handler.link.type.MediaLinkType; -#if ( $optionWcmioSiteApi == "y" ) -import io.wcm.siteapi.handler.link.SiteApiLinkMarkupBuilder; -import io.wcm.siteapi.handler.link.SiteApiLinkPreProcessor; -#end import io.wcm.wcm.commons.util.Template; import ${package}.config.AppTemplate; @@ -45,35 +34,12 @@ public class LinkHandlerConfigImpl extends LinkHandlerConfig { ExternalLinkType.class, MediaLinkType.class); -#if ( $optionWcmioSiteApi == "y" ) - private static final List> PRE_PROCESSORS = List.of( - SiteApiLinkPreProcessor.class); - - private static final List> LINK_MARKUP_BUILDERS = List.of( - SiteApiLinkMarkupBuilder.class, - SimpleLinkMarkupBuilder.class); - -#end @Override @SuppressWarnings("squid:S2384") // returned list is immutable public @NotNull List> getLinkTypes() { return LINK_TYPES; } -#if ( $optionWcmioSiteApi == "y" ) - @Override - @SuppressWarnings("squid:S2384") // returned list is immutable - public @NotNull List> getPreProcessors() { - return PRE_PROCESSORS; - } - - @Override - @SuppressWarnings("squid:S2384") // returned list is immutable - public @NotNull List> getMarkupBuilders() { - return LINK_MARKUP_BUILDERS; - } - -#end @Override public boolean isValidLinkTarget(@NotNull Page page) { return !Template.is(page, AppTemplate.ADMIN_STRUCTURE_ELEMENT); diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/LinkReference.java b/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/LinkReference.java deleted file mode 100644 index a2e8cb82..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/LinkReference.java +++ /dev/null @@ -1,61 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.reference; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import com.day.cq.wcm.api.Page; - -import io.wcm.handler.link.Link; - -/** - * Represents a link in Site API. - */ -public class LinkReference { - - private final Link link; - - /** - * @param link Valid link - */ - public LinkReference(Link link) { - this.link = link; - } - - /** - * @return Link type - */ - public @NotNull String getType() { - return link.getLinkType().getId(); - } - - /** - * @return Link URL - */ - public @NotNull String getUrl() { - return link.getUrl(); - } - - /** - * @return Link window target - */ - public @Nullable String getTarget() { - return link.getLinkRequest().getLinkArgs().getWindowTarget(); - } - - /** - * @return Page path (for internal links) - */ - public @Nullable String getPath() { - Page page = link.getTargetPage(); - if (page != null) { - return page.getPath(); - } - else { - return null; - } - } - -} diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/MediaReference.java b/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/MediaReference.java deleted file mode 100644 index 9c1186a7..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/MediaReference.java +++ /dev/null @@ -1,48 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.reference; - -import java.util.Collection; - -import org.jetbrains.annotations.NotNull; - -import io.wcm.handler.media.Media; -import io.wcm.handler.media.Rendition; - -/** - * Represents a media reference in Site API. - */ -public class MediaReference { - - private final Media media; - - /** - * @param media Valid media - */ - public MediaReference(Media media) { - this.media = media; - } - - /** - * @return Main asset URL - */ - public @NotNull String getUrl() { - return media.getUrl(); - } - - /** - * @return Asset path - */ - public @NotNull String getPath() { - return media.getAsset().getPath(); - } - - /** - * @return Renditions - */ - public Collection getRenditions() { - return media.getRenditions(); - } - -} diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/LinkReferenceDecorator.java b/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/LinkReferenceDecorator.java deleted file mode 100644 index 77d519a1..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/LinkReferenceDecorator.java +++ /dev/null @@ -1,26 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.reference.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.osgi.service.component.annotations.Component; - -import io.wcm.handler.link.Link; -import io.wcm.siteapi.handler.link.LinkDecorator; - -import ${package}.reference.LinkReference; - -/** - * Decorates link with project-specific {@link LinkReference}. - */ -@Component(service = LinkDecorator.class) -public class LinkReferenceDecorator implements LinkDecorator { - - @Override - public @Nullable LinkReference apply(@NotNull Link link) { - return new LinkReference(link); - } - -} diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/MediaReferenceDecorator.java b/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/MediaReferenceDecorator.java deleted file mode 100644 index 3ec02b26..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/java/reference/impl/MediaReferenceDecorator.java +++ /dev/null @@ -1,26 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}.reference.impl; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.osgi.service.component.annotations.Component; - -import io.wcm.handler.media.Media; -import io.wcm.siteapi.handler.media.MediaDecorator; - -import ${package}.reference.MediaReference; - -/** - * Decorates media with project-specific {@link MediaReference}. - */ -@Component(service = MediaDecorator.class) -public class MediaReferenceDecorator implements MediaDecorator { - - @Override - public @Nullable MediaReference apply(@NotNull Media media) { - return new MediaReference(media); - } - -} diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/accordion/accordion.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/accordion/accordion.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/accordion/accordion.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/carousel/carousel.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/carousel/carousel.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/carousel/carousel.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/tabs/tabs.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/tabs/tabs.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/container/tabs/tabs.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/button/button.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/button/button.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/button/button.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragment/contentfragment.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragment/contentfragment.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragment/contentfragment.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragmentlist/contentfragmentlist.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragmentlist/contentfragmentlist.html deleted file mode 100644 index 06279553..00000000 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/contentfragmentlist/contentfragmentlist.html +++ /dev/null @@ -1,3 +0,0 @@ -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#end \ No newline at end of file diff --git a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/customcarousel/customcarousel.html b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/customcarousel/customcarousel.html index a6083fb6..5a28182d 100644 --- a/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/customcarousel/customcarousel.html +++ b/src/main/resources/archetype-resources/bundles/core/src/main/webapp/app-root/components/content/customcarousel/customcarousel.html @@ -1,9 +1,6 @@ #set( $symbol_pound = '#' ) #set( $symbol_dollar = '$' ) #set( $symbol_escape = '\' ) -#if ( $optionWcmioSiteApiGenericEdit == "y" ) - -#else