This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-12580-include-examples in repository https://gitbox.apache.org/repos/asf/sling-project-archetype.git
commit d2229809912a3454971e3f790e0cd1346963497e Author: Stefan Seifert <[email protected]> AuthorDate: Wed Dec 18 11:51:21 2024 +0100 SLING-12580 include examples in feature launcher when enabled as "separate" --- src/main/resources/archetype-resources/all/pom.xml | 7 +----- .../archetype-resources/ui.apps.example/pom.xml | 20 ----------------- .../src/main/content/META-INF/vault/filter.xml | 4 +--- .../apps/__appsFolderName__/install/.content.xml | 26 ---------------------- .../resources/archetype-resources/ui.apps/pom.xml | 20 ----------------- .../src/main/content/META-INF/vault/filter.xml | 5 ++--- .../apps/__appsFolderName__/install/.content.xml | 26 ---------------------- 7 files changed, 4 insertions(+), 104 deletions(-) diff --git a/src/main/resources/archetype-resources/all/pom.xml b/src/main/resources/archetype-resources/all/pom.xml index d8be963..a6327e5 100644 --- a/src/main/resources/archetype-resources/all/pom.xml +++ b/src/main/resources/archetype-resources/all/pom.xml @@ -42,10 +42,6 @@ </properties> <dependencies> -#if ($optionExample=='s') -<!-- - Includes examples instead of the main modules. Once you are ready with your own code, remove the examples below and include the main modules instead. -#end <dependency> <groupId>\${project.groupId}</groupId> <artifactId>core</artifactId> @@ -58,7 +54,6 @@ <type>content-package</type> </dependency> #if ($optionExample=='s') ---> <dependency> <groupId>\${project.groupId}</groupId> <artifactId>core.example</artifactId> @@ -80,7 +75,7 @@ <artifactId>filevault-package-maven-plugin</artifactId> <configuration> <packageType>container</packageType> - <embeddedTarget>/apps/\${appsFolderName}/install</embeddedTarget> + <embeddedTarget>/apps/\${appsFolderName}-all/install</embeddedTarget> <embeddeds> #if ($optionExample=='s') <!-- diff --git a/src/main/resources/archetype-resources/ui.apps.example/pom.xml b/src/main/resources/archetype-resources/ui.apps.example/pom.xml index ac382e2..b1922e2 100644 --- a/src/main/resources/archetype-resources/ui.apps.example/pom.xml +++ b/src/main/resources/archetype-resources/ui.apps.example/pom.xml @@ -55,16 +55,6 @@ deployments. --> - <!-- @startForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <dependencies> - <dependency> - <groupId>\${project.groupId}</groupId> - <artifactId>core.example</artifactId> - <version>\${project.version}</version> - </dependency> - </dependencies> - <!-- @endForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <build> <plugins> <plugin> @@ -72,16 +62,6 @@ <artifactId>filevault-package-maven-plugin</artifactId> <configuration> <filterSource>\${basedir}/src/main/content/META-INF/vault/filter.xml</filterSource> - <!-- @startForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <embeddedTarget>/apps/\${appsFolderName}/install</embeddedTarget> - <embeddeds> - <embedded> - <groupId>\${project.groupId}</groupId> - <artifactId>core.example</artifactId> - <filter>true</filter> - </embedded> - </embeddeds> - <!-- @endForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> </configuration> </plugin> </plugins> diff --git a/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/filter.xml b/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/filter.xml index fc4b203..0b8f551 100644 --- a/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/filter.xml +++ b/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/filter.xml @@ -37,9 +37,7 @@ as it is in the '/apps/${appsFolderName}/install' folder (see the 'all' package). --> - <filter root="/apps/${appsFolderName}"> - <exclude pattern="/apps/${appsFolderName}/install/.*"/> - </filter> + <filter root="/apps/${appsFolderName}"/> <!-- Sets up redirects to make the application easier to access. Can diff --git a/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml b/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml deleted file mode 100644 index 5f7ce25..0000000 --- a/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml +++ /dev/null @@ -1,26 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"; xmlns:jcr="http://www.jcp.org/jcr/1.0"; - jcr:primaryType="sling:Folder" - jcr:title="Install Folder" -/> diff --git a/src/main/resources/archetype-resources/ui.apps/pom.xml b/src/main/resources/archetype-resources/ui.apps/pom.xml index b786dd0..d035605 100644 --- a/src/main/resources/archetype-resources/ui.apps/pom.xml +++ b/src/main/resources/archetype-resources/ui.apps/pom.xml @@ -54,16 +54,6 @@ and errorneous situations. --> - <!-- @startForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <dependencies> - <dependency> - <groupId>\${project.groupId}</groupId> - <artifactId>core</artifactId> - <version>\${project.version}</version> - </dependency> - </dependencies> - <!-- @endForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <build> <plugins> <plugin> @@ -71,16 +61,6 @@ <artifactId>filevault-package-maven-plugin</artifactId> <configuration> <filterSource>\${basedir}/src/main/content/META-INF/vault/filter.xml</filterSource> - <!-- @startForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> - <embeddedTarget>/apps/\${appsFolderName}/install</embeddedTarget> - <embeddeds> - <embedded> - <groupId>\${project.groupId}</groupId> - <artifactId>core</artifactId> - <filter>true</filter> - </embedded> - </embeddeds> - <!-- @endForNotAll@ This is used for the Post Generation Handling. Do not alter or remove --> </configuration> </plugin> </plugins> diff --git a/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/filter.xml b/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/filter.xml index 4b12740..df7c9bb 100644 --- a/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/filter.xml +++ b/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/filter.xml @@ -36,7 +36,6 @@ as it is in the '/apps/${appsFolderName}/install' folder (see the 'all' package). --> - <filter root="/apps/${appsFolderName}"> - <exclude pattern="/apps/${appsFolderName}/install/.*"/> - </filter> + <filter root="/apps/${appsFolderName}"/> + </workspaceFilter> diff --git a/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml b/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml deleted file mode 100644 index 5f7ce25..0000000 --- a/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml +++ /dev/null @@ -1,26 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"; xmlns:jcr="http://www.jcp.org/jcr/1.0"; - jcr:primaryType="sling:Folder" - jcr:title="Install Folder" -/>
