Create dedicated Oak index definition for AEM as a Cloud Service (#550)

kwin · web-flow · commit dd7e51e09466 · 2021-02-02T08:41:08.000+01:00
Update to the newest filevault-package-maven-plugin 1.1.6 This closes #549
diff --git a/README.md b/README.md
@@ -53,6 +53,14 @@ You can get the content package containing the [index definition](http://jackrab
     <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
     <artifactId>accesscontroltool-oakindex-package</artifactId>
 ```
+(for AEM Classic/On Premise) or
+
+```
+    <groupId>biz.netcentric.cq.tools.accesscontroltool</groupId>
+    <artifactId>accesscontroltool-oakindex-package</artifactId>
+    <classifier>cloud</classifier>
+```
+(for AEM as a Cloud Service)
 
 Install it afterwards e.g. via AEM's package manager.
 
diff --git a/accesscontroltool-apps-package/pom.xml b/accesscontroltool-apps-package/pom.xml
@@ -34,12 +34,22 @@
                 <artifactId>filevault-package-maven-plugin</artifactId>
                 <configuration>
                     <packageType>application</packageType>
-                    <!-- filter roots are not given in any dependency  -->
-                    <failOnDependencyErrors>false</failOnDependencyErrors>
                     <properties>
                         <!-- ACLs are included to show AC Tool by default only to admin -->
                         <acHandling>merge_preserve</acHandling>
                     </properties>
+                    <validatorsSettings>
+                        <jackrabbit-filter>
+                            <options>
+                                <validRoots>/apps/netcentric/actool,/apps/cq/core/content</validRoots>
+                            </options>
+                        </jackrabbit-filter>
+                        <jackrabbit-packagetype>
+                            <options>
+                                <allowComplexFilterRulesInApplicationPackages>true</allowComplexFilterRulesInApplicationPackages>
+                            </options>
+                        </jackrabbit-packagetype>
+                    </validatorsSettings>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml
@@ -8,6 +8,6 @@
         <include pattern="/apps/cq/core/content/nav"/>
         <include pattern="/apps/cq/core/content/nav/tools"/>
         <include pattern="/apps/cq/core/content/nav/tools/security"/>
-        <include pattern="/apps/cq/core/content/nav/tools/security/actool"/>
+        <include pattern="/apps/cq/core/content/nav/tools/security/actool(.*)?"/>
     </filter>
 </workspaceFilter>
diff --git a/accesscontroltool-content-package/pom.xml b/accesscontroltool-content-package/pom.xml
@@ -37,6 +37,12 @@
                     <properties>
                         <acHandling>merge_preserve</acHandling>
                     </properties>
+                    <validatorsSettings>
+                        <jackrabbit-nodetypes>
+                            <!-- disable due to https://issues.apache.org/jira/browse/JCRVLT-497 -->
+                            <isDisabled>true</isDisabled>
+                        </jackrabbit-nodetypes>
+                    </validatorsSettings>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/accesscontroltool-oakindex-package/pom.xml b/accesscontroltool-oakindex-package/pom.xml
@@ -37,7 +37,37 @@
                     <group>Netcentric</group>
                     <filterSource>src/main/META-INF/vault/filter.xml</filterSource>
                     <allowIndexDefinitions>true</allowIndexDefinitions>
+                    <!-- overwrite (compare with https://issues.apache.org/jira/browse/JCRVLT-496) -->
+                    <packageType>application</packageType>
+                    <validatorsSettings>
+                        <jackrabbit-packagetype>
+                            <!-- https://issues.apache.org/jira/browse/JCRVLT-496 -->
+                            <isDisabled>true</isDisabled>
+                        </jackrabbit-packagetype>
+                    </validatorsSettings>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>generate-metadata-for-cloud</id>
+                        <goals>
+                            <goal>generate-metadata</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>cloud</classifier>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>package-for-cloud</id>
+                        <goals>
+                            <goal>package</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>cloud</classifier>
+                            <!-- due to https://issues.apache.org/jira/browse/JCRVLT-498 -->
+                            <workDirectory>${project.build.directory}/vault-work-cloud</workDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
            </plugin>
 
             <plugin>
diff --git a/accesscontroltool-oakindex-package/src/main/META-INF/vault/config.xml b/accesscontroltool-oakindex-package/src/main/META-INF/vault/config.xml
diff --git a/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-	<filter root="/oak:index/repACL"/>       
+	<filter root="/oak:index/repACL-custom-1"/>
 </workspaceFilter>
diff --git a/accesscontroltool-oakindex-package/src/main/META-INF/vault/settings.xml b/accesscontroltool-oakindex-package/src/main/META-INF/vault/settings.xml
diff --git a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/.content.xml b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/.content.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"
+    jcr:primaryType="nt:unstructured"/>
diff --git a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL-custom-1.xml b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL-custom-1.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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"
+    jcr:primaryType="oak:QueryIndexDefinition"
+    async="async"
+    compatVersion="{Long}2"
+    type="lucene">
+    <indexRules jcr:primaryType="nt:unstructured">
+        <rep:ACL jcr:primaryType="nt:unstructured">
+            <properties jcr:primaryType="nt:unstructured">
+                <primaryType
+                    jcr:primaryType="nt:unstructured"
+                    name="jcr:primaryType"
+                    propertyIndex="{Boolean}true"/>
+                <mixinTypes
+                    jcr:primaryType="nt:unstructured"
+                    name="jcr:mixinTypes"
+                    propertyIndex="{Boolean}true"/>
+            </properties>
+        </rep:ACL>
+    </indexRules>
+</jcr:root>
diff --git a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL.xml b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL.xml
diff --git a/accesscontroltool-package/pom.xml b/accesscontroltool-package/pom.xml
@@ -107,6 +107,8 @@
                     </subPackages>
                     <!-- is still mixed due to the contained content package -->
                     <packageType>mixed</packageType>
+                    <!-- all sub packages have been validated already -->
+                    <skipSubPackageValidation>true</skipSubPackageValidation>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
@@ -466,12 +466,66 @@
                 <plugin>
                     <groupId>org.apache.jackrabbit</groupId>
                     <artifactId>filevault-package-maven-plugin</artifactId>
-                    <version>1.0.4</version>
+                    <version>1.1.6</version>
                     <extensions>true</extensions>
                     <configuration>
                         <group>Netcentric</group>
                         <filterSource>src/main/META-INF/vault/filter.xml</filterSource>
+                        <validatorsSettings>
+                            <jackrabbit-filter>
+                                <options>
+                                    <validRoots>/,/libs,/libs/core/wcm,/apps,/apps/netcentric,/apps/netcentric/actool,/etc,/etc/packages,/tmp,/content,/oak:index</validRoots>
+                                </options>
+                            </jackrabbit-filter>
+                            <jackrabbit-nodetypes>
+                                <options>
+                                    <!-- use the nodetypes and namespaces from the aem-nodetypes.jar provided in the plugin dependencies -->
+                                    <cnds>tccl:aem.cnd</cnds>
+                                </options>
+                            </jackrabbit-nodetypes>
+                            <netcentric-aem-classification>
+                                <defaultSeverity>WARN</defaultSeverity>
+                                <options>
+                                    <severitiesPerClassification>INTERNAL_DEPRECATED=WARN</severitiesPerClassification>
+                                    <maps>tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-deprecations/coral2deprecations.map,tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-deprecations/graniteuideprecations.map,tccl:biz/netcentric/filevault/validator/maps/aem-classification-map-repo-annotations.map</maps>
+                                </options>
+                            </netcentric-aem-classification>
+                            <netcentric-aem-cloud>
+                                <options>
+                                    <allowVarNodeOutsideContainer>false</allowVarNodeOutsideContainer><!-- default value is true, as it is allowed to have /var nodes inside author-only container -->
+                                </options>
+                            </netcentric-aem-cloud>
+                        </validatorsSettings>
                     </configuration>
+                    <dependencies>
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator</groupId>
+                            <artifactId>aem-classification-validator</artifactId>
+                            <version>1.0.0</version>
+                        </dependency>
+                        <!-- the dependency containing the actual classification map -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator.maps</groupId>
+                            <artifactId>aem-classification-map-repo-annotations</artifactId>
+                            <version>6.5.3.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator.maps</groupId>
+                            <artifactId>aem-classification-map-deprecations</artifactId>
+                            <version>6.5.0.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>biz.netcentric.aem</groupId>
+                            <artifactId>aem-nodetypes</artifactId>
+                            <version>6.5.7.0</version>
+                        </dependency>
+                        <!-- https://github.com/Netcentric/aem-cloud-validator -->
+                        <dependency>
+                            <groupId>biz.netcentric.filevault.validator</groupId>
+                            <artifactId>aem-cloud-validator</artifactId>
+                            <version>1.0.0</version>
+                         </dependency>
+                    </dependencies>
                 </plugin>
                 <!-- for deploying to AEM -->
                 <plugin>

Original file line number	Diff line number	Diff 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" xmlns:rep="internal" xmlns:oak="http://jackrabbit.apache.org/oak/ns/1.0"`
	`3`	`+ jcr:primaryType="nt:unstructured"/>`