Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 74445 invoked from network); 17 Nov 2009 20:28:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Nov 2009 20:28:03 -0000 Received: (qmail 1177 invoked by uid 500); 17 Nov 2009 20:28:03 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 1100 invoked by uid 500); 17 Nov 2009 20:28:02 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 896 invoked by uid 99); 17 Nov 2009 20:28:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 20:28:02 +0000 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; Tue, 17 Nov 2009 20:28:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0C342388989; Tue, 17 Nov 2009 20:27:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881492 - /sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java Date: Tue, 17 Nov 2009 20:27:39 -0000 To: commits@sling.apache.org From: fmeschbe@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091117202739.A0C342388989@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Tue Nov 17 20:27:39 2009 New Revision: 881492 URL: http://svn.apache.org/viewvc?rev=881492&view=rev Log: SLING-1192 use nt:file and nt:folder for files and folders and drop the special resource super type Modified: sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java Modified: sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java?rev=881492&r1=881491&r2=881492&view=diff ============================================================================== --- sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java (original) +++ sling/trunk/bundles/extensions/fsresource/src/main/java/org/apache/sling/fsprovider/internal/FsResource.java Tue Nov 17 20:27:39 2009 @@ -38,25 +38,17 @@ */ public class FsResource extends SlingAdaptable implements Resource { - - /** - * The common resource super type for files and folders mapped into the - * resource tree by the {@link FsResourceProvider} (value is - * "sling/fs/resource"). - */ - private static final String RESOURCE_TYPE_ROOT = "sling/fs/resource"; - /** * The resource type for file system files mapped into the resource tree by - * the {@link FsResourceProvider} (value is "sling/fs/file"). + * the {@link FsResourceProvider} (value is "nt:file"). */ - private static final String RESOURCE_TYPE_FILE = "sling/fs/file"; + private static final String RESOURCE_TYPE_FILE = "nt:file"; /** * The resource type for file system folders mapped into the resource tree - * by the {@link FsResourceProvider} (value is "sling/fs/folder"). + * by the {@link FsResourceProvider} (value is "nt:folder"). */ - private static final String RESOURCE_TYPE_FOLDER = "sling/fs/folder"; + private static final String RESOURCE_TYPE_FOLDER = "nt:folder"; // default log, assigned on demand private Logger log; @@ -123,7 +115,7 @@ * Returns {@link FsProviderConstants#RESOURCE_TYPE_ROOT} */ public String getResourceSuperType() { - return RESOURCE_TYPE_ROOT; + return null; } /**