Author: fmeschbe
Date: Wed Sep 17 23:15:27 2008
New Revision: 696568
URL: http://svn.apache.org/viewvc?rev=696568&view=rev
Log:
SLING-663 sling:Folder changes:
* sling:Folder extends nt:folder and is not orderable
* sling:OrderedFolder extends sling:Folder and is orderable
* sling:HierarchyNode mixin extends nt:hierarchyNode
Modified:
incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd
Modified:
incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd?rev=696568&r1=696567&r2=696568&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd
(original)
+++
incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd
Wed Sep 17 23:15:27 2008
@@ -25,23 +25,45 @@
mixin
- sling:resourceType (string)
+
//-----------------------------------------------------------------------------
// Mixin node type for nodes providing resource super type information
[sling:ResourceSuperType]
mixin
- sling:resourceSuperType (string)
+
//-----------------------------------------------------------------------------
// Node type to be used as a replacement for nt:folder: it can be used
// as a child of nt:folder and allows to add unstructured content
-[sling:Folder] > nt:hierarchyNode, nt:unstructured
- orderable
- + * (nt:base) = sling:Folder version
-
+// (See SLING-663)
+[sling:Folder] > nt:folder
+ - * (undefined) multiple
+ - * (undefined)
+ + * (nt:hierarchyNode) = sling:Folder version
+
+
+//-----------------------------------------------------------------------------
+// Mixin node type to turn any node into an nt:hierarchyNode to place
+// below any nt:folder (or extension thereof such as sling:Folder)
+// (See SLING-663)
+[sling:HierarchyNode] > nt:hierarchyNode
+ mixin
+
+
+//-----------------------------------------------------------------------------
+// Node type extending sling:Folder supporting the creation of folder
+// structured with child node ordering.
+// (See SLING-663)
+[sling:OrderedFolder] > sling:Folder
+ orderable
+ + * (nt:hierarchyNode) = sling:OrderedFolder version
+
+
//-----------------------------------------------------------------------------
// Mixin node type for defining vanity resource path.
[sling:VanityPath]
- mixin
+ mixin
- sling:vanityPath (string)
- sling:redirect (boolean)
- sling:vanityOrder (long)
