Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4339C108F8 for ; Thu, 16 Jan 2014 10:02:13 +0000 (UTC) Received: (qmail 60199 invoked by uid 500); 16 Jan 2014 10:02:12 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 60133 invoked by uid 500); 16 Jan 2014 10:02:12 -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 60123 invoked by uid 99); 16 Jan 2014 10:02:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jan 2014 10:02:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 16 Jan 2014 10:02:09 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 951552388860; Thu, 16 Jan 2014 10:01:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1558732 - /sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java Date: Thu, 16 Jan 2014 10:01:48 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140116100148.951552388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Thu Jan 16 10:01:48 2014 New Revision: 1558732 URL: http://svn.apache.org/r1558732 Log: SLING-2698 - resource access security service for resource providers. Distinguish between context application and provider Modified: sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java Modified: sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java?rev=1558732&r1=1558731&r2=1558732&view=diff ============================================================================== --- sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java (original) +++ sling/trunk/bundles/resourceaccesssecurity/src/main/java/org/apache/sling/resourceaccesssecurity/impl/Activator.java Thu Jan 16 10:01:48 2014 @@ -46,12 +46,14 @@ public class Activator implements Bundle final Dictionary appProps = new Hashtable(); appProps.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Application Resource Access Security"); + appProps.put(ResourceAccessSecurity.CONTEXT, ResourceAccessSecurity.APPLICATION_CONTEXT); this.appReg = context.registerService(ResourceAccessSecurity.class.getName(), new ResourceAccessSecurityImpl(this.resourceAccessGateTracker, true), appProps); final Dictionary provProps = new Hashtable(); provProps.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Provider Resource Access Security"); + provProps.put(ResourceAccessSecurity.CONTEXT, ResourceAccessSecurity.PROVIDER_CONTEXT); this.provReg = context.registerService(ResourceAccessSecurity.class.getName(), new ResourceAccessSecurityImpl(this.resourceAccessGateTracker, false), provProps);