Skip to content

Commit a3ca7ed

Browse files
kwinkwin
committed
Never emit validation errors for default config
Add IT to verify this behaviour described in the readme This closes #2
1 parent 217a230 commit a3ca7ed

File tree

23 files changed

+332
-55
lines changed

23 files changed

+332
-55
lines changed

‎src/it/no-config/application-package/pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<artifactId>application-package</artifactId>
6+
<packaging>content-package</packaging>
7+
<parent>
8+
<groupId>biz.netcentric.filevault.validator.aem.namespace.it</groupId>
9+
<artifactId>no-config</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
</parent>
12+
<build>
13+
<plugins>
14+
<plugin>
15+
<groupId>org.apache.jackrabbit</groupId>
16+
<artifactId>filevault-package-maven-plugin</artifactId>
17+
<configuration>
18+
<packageType>mixed</packageType><!-- due to oak index -->
19+
<allowIndexDefinitions>true</allowIndexDefinitions>
20+
</configuration>
21+
</plugin>
22+
</plugins>
23+
</build>
24+
</project>

‎src/it/no-config/application-package/src/main/META-INF/vault/filter.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<workspaceFilter version="1.0">
3+
<filter root="/apps/mytenant">
4+
</filter>
5+
<filter root="/oak:index/mytenant-custom-1">
6+
</filter>
7+
</workspaceFilter>

‎src/it/no-config/application-package/src/main/jcr_root/_oak_index/.content.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:rep="internal"
3+
jcr:mixinTypes="[rep:AccessControllable]"
4+
jcr:primaryType="nt:unstructured"/>

‎src/it/no-config/application-package/src/main/jcr_root/_oak_index/mytenant-custom-1/.content.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
4+
jcr:primaryType="oak:QueryIndexDefinition"
5+
type="lucene"
6+
async="async"
7+
compatibilityMode="cloud"
8+
evaluatePathRestrictions="{Boolean}true"
9+
reindex="{Boolean}false"
10+
includedPaths="[/content/mytenant/something]">
11+
</jcr:root>

‎src/it/no-config/application-package/src/main/jcr_root/apps/mytenant/_sling_configs/.content.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:primaryType="sling:Folder"/>

‎src/it/no-config/application-package/src/main/jcr_root/apps/mytenant/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:primaryType="cq:Page">
4+
<jcr:content
5+
jcr:primaryType="cq:PageContent"
6+
sling:configPropertyInherit="{Boolean}false"
7+
enabled="{Boolean}true"/>
8+
</jcr:root>

‎src/it/no-config/application-package/src/main/jcr_root/apps/mytenant/clientlibrary1/.content.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:primaryType="cq:ClientLibraryFolder"
4+
categories="[mytenant-librarya,mytenant-libraryb]"/>

‎src/it/no-config/application-package/src/main/jcr_root/apps/mytenant/components/component1/.content.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
3+
jcr:primaryType="sling:Folder"
4+
sling:resourceType="/apps/othertenant/components/component2"
5+
sling:resourceSuperType="/apps/othertenant/components/component1"/>

‎src/it/no-config/application-package/src/main/jcr_root/apps/mytenant/test.txt‎

Whitespace-only changes.

‎src/it/no-config/container-package/pom.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<artifactId>container-package</artifactId>
6+
<packaging>content-package</packaging>
7+
<parent>
8+
<groupId>biz.netcentric.filevault.validator.aem.namespace.it</groupId>
9+
<artifactId>no-config</artifactId>
10+
<version>1.0.0-SNAPSHOT</version>
11+
</parent>
12+
<build>
13+
<plugins>
14+
<plugin>
15+
<groupId>org.apache.jackrabbit</groupId>
16+
<artifactId>filevault-package-maven-plugin</artifactId>
17+
<configuration>
18+
<packageType>container</packageType>
19+
</configuration>
20+
</plugin>
21+
</plugins>
22+
</build>
23+
</project>

0 commit comments

Comments
 (0)