diff --git a/README.md b/README.md
index cb4381f..55e3596 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
![Java CI/CD](https://github.com/Netcentric/aem-nodetypes/workflows/Java%20CI/CD/badge.svg)
# Overview
-Provides a [CND file][1] with all Nodetypes and Namespaces defined in AEM. It can be used for the [FileVault Validation Module][2] and its `jackrabbit-nodetype` validator.
+Provides a [CND file][1] with all Node types and Namespaces defined in AEM. It can be used for the [FileVault Validation Module][2] and its `jackrabbit-nodetype` validator.
# Usage with Maven
You can use this module with the [FileVault Package Maven Plugin][3] in version 1.1.4 or higher like this
@@ -37,3 +37,12 @@ You can use this module with the [FileVault Package Maven Plugin][3] in version
[1]: https://jackrabbit.apache.org/jcr/node-type-notation.html
[2]: https://jackrabbit.apache.org/filevault/validation.html
[3]: https://jackrabbit.apache.org/filevault-package-maven-plugin/index.html
+
+# Provided Versions
+
+| Version | Type | Description |
+| --------- | ------- | ------------ |
+| 6.5.5.0 | Classic | Exported from AEM 6.5.5, has not changed for AEM 6.5.6 |
+| 2020.09.0 | Cloud | Exported from AEM SDK 2020.9.4194.20200909T200349Z-200827 |
+
+Pick the version which is closest to your AEM version. In general the node types are very stable (i.e. do not change for service packs in Classic and very rarely in Cloud aka AEMaaCS).
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index dd2866a..d23c743 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,11 +2,11 @@
4.0.0
biz.netcentric.aem
aem-nodetypes
- 6.5.5.1-SNAPSHOT
+ 2020.09.0-SNAPSHOT
jar
- AEM Nodetypes (as CND)
- This module contains the nodetypes and namespaces being defined in AEM as a cnd file
+ AEM Node Types and Namespaces
+ This module contains the node types and namespaces being defined in AEM as a cnd file
https://github.com/Netcentric/aem-nodetypes
2020
diff --git a/src/main/resources/aem.cnd b/src/main/resources/aem.cnd
index c167680..9a55baa 100644
--- a/src/main/resources/aem.cnd
+++ b/src/main/resources/aem.cnd
@@ -17,17 +17,15 @@
<'cq'='http://www.day.com/jcr/cq/1.0'>
<'oak'='http://jackrabbit.apache.org/oak/ns/1.0'>
<'jcr'='http://www.jcp.org/jcr/1.0'>
-<'mix'='http://www.jcp.org/jcr/mix/1.0'>
<'granite'='http://www.adobe.com/jcr/granite/1.0'>
+<'mix'='http://www.jcp.org/jcr/mix/1.0'>
<'rep'='internal'>
<'xmp'='http://ns.adobe.com/xap/1.0/'>
-<'social'='http://www.adobe.com/social/1.0'>
<'dam'='http://www.day.com/dam/1.0'>
<'oauth'='http://oauth.net/'>
<'rdf'='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
<'vlt'='http://www.day.com/jcr/vault/1.0'>
<'slingevent'='http://sling.apache.org/jcr/event/1.0'>
-<'fd'='http://www.adobe.com/aemfd/fd/1.0'>
[sling:OrderedFolder] > sling:Folder
orderable
@@ -45,15 +43,6 @@
primaryitem jcr:content
- jcr:content (reference) mandatory
-[cq:Comment] > cq:Taggable, mix:created, mix:language, mix:title, nt:unstructured
- - userAgent (string)
- - url (string)
- - ip (string)
- - userIdentifier (string)
- - email (string)
- - referer (string)
- - authorizableId (string)
-
[granite:Component] > sling:Folder, sling:ResourceSuperType
mixin
- isContainer (boolean)
@@ -116,12 +105,12 @@
[cq:WorkflowNode]
orderable
- - title (string)
- description (string)
- - maxIdleTime (long)
+ - title (string)
+ - * (undefined) multiple
- type (string)
+ - maxIdleTime (long)
- * (undefined)
- - * (undefined) multiple
+ metaData (nt:unstructured)
+ timeoutConfiguration (nt:unstructured)
@@ -140,17 +129,10 @@
- icon (string)
- title (string)
-[cq:GeoLocation]
- mixin
- - longitude (double)
- - latitude (double)
-
[rep:Privileges]
- rep:next (long) mandatory protected multiple
+ * (rep:Privilege) = rep:Privilege protected abort
-[social:asiResource] > sling:Folder
-
[cq:Taggable]
mixin
- cq:tags (string) multiple
@@ -176,13 +158,13 @@
[cq:WorkflowModel] > mix:versionable
orderable
- - title (string)
- description (string)
- sling:resourceType (string) = 'cq/workflow/components/model' mandatory autocreated
+ - title (string)
+ + variables (nt:unstructured)
+ + metaData (nt:unstructured)
+ nodes (nt:unstructured)
+ transitions (nt:unstructured)
- + metaData (nt:unstructured)
- + variables (nt:unstructured)
[nt:activity] > mix:referenceable
- jcr:activityTitle (string) mandatory autocreated protected
@@ -268,9 +250,9 @@
- nodeId (string)
[cq:Wait]
- - workflowId (string)
- - destNodeId (string)
- fromNodeId (string)
+ - destNodeId (string)
+ - workflowId (string)
[cq:BlueprintAction] > nt:unstructured
@@ -347,12 +329,12 @@
- jcr:data (binary) mandatory
[rep:ACE]
- - rep:principalName (string) mandatory protected
- - rep:privileges (name) mandatory protected multiple
- - rep:nodePath (path) protected
- - rep:glob (string) protected
- - * (undefined) protected
- + rep:restrictions (rep:Restrictions) = rep:Restrictions protected
+ - rep:principalName (string) mandatory protected ignore
+ - rep:privileges (name) mandatory protected multiple ignore
+ - rep:nodePath (path) protected ignore
+ - rep:glob (string) protected ignore
+ - * (undefined) protected ignore
+ + rep:restrictions (rep:Restrictions) = rep:Restrictions protected ignore
[rep:versionStorage]
- * (undefined) protected abort
@@ -370,23 +352,17 @@
+ oak:index (nt:base) = nt:unstructured
[cq:Payload]
- - path (path)
- - uuid (string)
- - jcr:url (string)
- binary (binary)
+ - uuid (string)
- javaObject (string)
- - * (undefined)
+ - jcr:url (string)
- * (undefined) multiple
+ - path (path)
+ - * (undefined)
[rdf:Alt] > xmp:Simple
+ * (xmp:Property)
-[cq:CommentContent] > sling:HierarchyNode
- orderable
- - * (undefined)
- - * (undefined) multiple
- + * (nt:base) = nt:unstructured version
-
[cq:ExporterConfig]
mixin
- source (string) mandatory
@@ -395,9 +371,9 @@
- enabled (boolean)
[cq:WorkflowStack]
+ - nodeId (string)
- containeeInstanceId (string)
- parentInstanceId (string)
- - nodeId (string)
[cq:RolloutConfig] > mix:title
orderable
@@ -425,13 +401,8 @@
- rank (long)
- status (string)
- subType (string)
- - locked (boolean)
- - returned (boolean)
- - allowInboxSharing (boolean)
- - allowExplicitSharing (boolean)
- - sharedWith (string) multiple
-[nt:frozenNode] > mix:referenceable
+[nt:frozenNode]
orderable
- jcr:frozenPrimaryType (name) mandatory autocreated protected abort
- jcr:frozenMixinTypes (name) protected multiple abort
@@ -452,12 +423,12 @@
- rep:declaringNodeType (name) mandatory protected
[cq:WorkItem] > granite:InboxItem
- - workflowId (string)
- nodeId (string)
- sling:resourceType (string)
- - completedBy (string)
- * (undefined)
- * (undefined) multiple
+ - workflowId (string)
+ - completedBy (string)
+ metaData (nt:unstructured)
[nt:version] > mix:referenceable
@@ -528,14 +499,14 @@
- * (undefined) protected multiple
[cq:WorkflowLauncher]
- - nodetype (string)
+ - workflow (string)
- glob (string)
- - eventType (long)
+ - * (undefined) multiple
+ - nodetype (string)
- description (string)
- condition (string)
- - workflow (string)
- * (undefined)
- - * (undefined) multiple
+ - eventType (long)
[rep:Impersonatable]
mixin
@@ -601,13 +572,6 @@
+ analytics (cq:meta) ignore
+ cq:meta (cq:meta) ignore
-[cq:Commerce]
- mixin
- - cq:commerceProvider (string)
-
-[cq:CatalogSyncAction]
- mixin
-
[sling:Message]
mixin
- sling:key (string)
@@ -633,6 +597,11 @@
mixin primaryitem rep:ours
+ rep:ours (rep:Unstructured) protected ignore
+[rep:PrincipalEntry]
+ - rep:effectivePath (path) mandatory protected ignore
+ - rep:privileges (name) mandatory protected multiple ignore
+ + rep:restrictions (rep:Restrictions) = rep:Restrictions protected ignore
+
[cq:ComponentMixin] > cq:Component
mixin
@@ -644,10 +613,6 @@
[cq:LiveCopy] > cq:LcPathFilter, cq:LiveSyncConfig
- cq:moveTarget (string)
-[cq:CommentAttachment] > nt:file
- - * (undefined) multiple
- - * (undefined)
-
[nt:base]
abstract
- jcr:primaryType (name) mandatory autocreated protected compute
@@ -690,10 +655,10 @@
+ metaData (nt:unstructured)
[cq:ProcessStack]
- - workflowId (string)
- - containerWorkflowModelId (string)
- containerWorkflowNodeId (string)
+ - workflowId (string)
- containerWorkflowEndNodeId (string)
+ - containerWorkflowModelId (string)
[slingevent:TimedEvent] > mix:lockable, slingevent:Event
- slingevent:processor (string)
@@ -705,10 +670,6 @@
[rep:root] > nt:unstructured
+ jcr:system (rep:system) = rep:system mandatory ignore
-[social:asiFile] > nt:file
- - * (undefined) multiple
- - * (undefined)
-
[cq:Page] > nt:hierarchyNode
orderable primaryitem jcr:content
+ jcr:content (nt:base) = nt:unstructured
@@ -723,8 +684,6 @@
- jcr:path (path)
- jcr:id (weakreference)
-[cq:Trackback] > mix:created, mix:language, mix:title, nt:unstructured
-
[dam:Thumbnails]
mixin
+ dam:thumbnails (nt:folder)
@@ -838,10 +797,10 @@
mixin
[cq:WorkflowData]
- - * (undefined)
- * (undefined) multiple
- + payload (cq:Payload)
+ - * (undefined)
+ metaData (nt:unstructured)
+ + payload (cq:Payload)
[cq:Field] > cq:Widget
orderable
@@ -931,20 +890,20 @@
[rep:SystemUser] > rep:User
[cq:Workflow] > mix:referenceable
- - modelId (string)
- - modelVersion (string)
- - startTime (date)
- - endTime (date)
- initiator (string)
- - * (undefined)
+ - endTime (date)
- * (undefined) multiple
+ - * (undefined)
+ - modelVersion (string)
+ - modelId (string)
+ - startTime (date)
- sling:resourceType (string)
- + workflowStack (nt:unstructured)
+ wait (nt:unstructured)
+ orTab (nt:unstructured)
+ data (cq:WorkflowData)
- + history (nt:unstructured)
+ + workflowStack (nt:unstructured)
+ metaData (nt:unstructured)
+ + history (nt:unstructured)
+ workItems (nt:unstructured)
[mix:language]
@@ -989,13 +948,14 @@
[rep:NamedPropertyDefinitions]
+ * (rep:PropertyDefinitions) = rep:PropertyDefinitions protected
+[rep:PrincipalPolicy] > rep:Policy
+ orderable
+ - rep:principalName (string) mandatory protected ignore
+ + * (rep:PrincipalEntry) = rep:PrincipalEntry protected ignore
+
[rep:nodeTypes]
+ * (nt:nodeType) = nt:nodeType protected abort
-[fd:xdp]
- mixin
- - fd:trusted (boolean)
-
[rep:AccessControllable]
mixin
+ rep:policy (rep:Policy) protected ignore
@@ -1021,6 +981,10 @@
- groups (string) multiple
+ parameters (nt:base) = nt:unstructured
+[rep:PrincipalBasedMixin]
+ mixin
+ + rep:principalPolicy (rep:PrincipalPolicy) protected ignore
+
[rep:RetentionManageable]
mixin
- rep:hold (undefined) protected multiple ignore
@@ -1071,9 +1035,9 @@
[cq:Tag] > mix:title, nt:hierarchyNode
orderable
+ - sling:resourceType (string) = 'cq/tagging/components/tag' mandatory autocreated
- * (undefined) multiple
- * (undefined)
- - sling:resourceType (string) = 'cq/tagging/components/tag' mandatory autocreated
+ * (nt:base) = cq:Tag version
[rep:DenyACE] > rep:ACE
@@ -1096,11 +1060,9 @@
+ * (rep:Authorizable) = rep:User version
+ * (rep:AuthorizableFolder) = rep:AuthorizableFolder version
-[cq:CatalogSyncConfig] > nt:unstructured
-
[cq:Project]
mixin
[rep:Restrictions]
- - * (undefined) protected
- - * (undefined) protected multiple
+ - * (undefined) protected ignore
+ - * (undefined) protected multiple ignore
\ No newline at end of file