Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 15136 invoked from network); 8 May 2008 13:57:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 May 2008 13:57:28 -0000 Received: (qmail 66749 invoked by uid 500); 8 May 2008 13:57:30 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 66706 invoked by uid 500); 8 May 2008 13:57:30 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 66697 invoked by uid 99); 8 May 2008 13:57:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 06:57:30 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 13:56:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 90C6B2388A31; Thu, 8 May 2008 06:56:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654530 - in /incubator/sling/trunk: jcr/resource/src/main/resources/SLING-INF/nodetypes/ sling/core/src/main/resources/SLING-INF/nodetypes/ sling/i18n/src/main/resources/SLING-INF/nodetypes/ Date: Thu, 08 May 2008 13:56:54 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080508135654.90C6B2388A31@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Thu May 8 06:56:54 2008 New Revision: 654530 URL: http://svn.apache.org/viewvc?rev=654530&view=rev Log: SLING-439: Reduce files for i18n node types, remove unused reference nodetype, move sling:Folder to jcr.resource. Removed: incubator/sling/trunk/sling/core/src/main/resources/SLING-INF/nodetypes/content.cnd incubator/sling/trunk/sling/core/src/main/resources/SLING-INF/nodetypes/references.cnd incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/slinglanguage.cnd Modified: incubator/sling/trunk/jcr/resource/src/main/resources/SLING-INF/nodetypes/resource.cnd incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/message.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=654530&r1=654529&r2=654530&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 Thu May 8 06:56:54 2008 @@ -31,3 +31,9 @@ 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 \ No newline at end of file Modified: incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd?rev=654530&r1=654529&r2=654530&view=diff ============================================================================== --- incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd (original) +++ incubator/sling/trunk/sling/i18n/src/main/resources/SLING-INF/nodetypes/message.cnd Thu May 8 06:56:54 2008 @@ -18,6 +18,17 @@ // + + + +// The sling:language mixin node type allows to list one or more base +// names of resource bundles to which the messages below this language +// node belong. +[sling:Language] > mix:language + mixin + - sling:basename (string) + - sling:basename (string) multiple + // Mixin node type for a single key to message mapping // This mixin node type may be applied to any node such, that mappings