Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 06AC6200D2B for ; Thu, 19 Oct 2017 01:21:49 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 05650160BF1; Wed, 18 Oct 2017 23:21:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37380160BF4 for ; Thu, 19 Oct 2017 01:21:48 +0200 (CEST) Received: (qmail 37938 invoked by uid 500); 18 Oct 2017 23:21:47 -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 37733 invoked by uid 99); 18 Oct 2017 23:21:47 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Oct 2017 23:21:47 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 84B1A81BFD; Wed, 18 Oct 2017 23:21:46 +0000 (UTC) Date: Wed, 18 Oct 2017 23:21:54 +0000 To: "commits@sling.apache.org" Subject: [sling-org-apache-sling-resourceaccesssecurity-it] 08/24: Clean up usage of SCR annotations MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: rombert@apache.org In-Reply-To: <150836890607.23574.15877022137891371867@gitbox.apache.org> References: <150836890607.23574.15877022137891371867@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: sling-org-apache-sling-resourceaccesssecurity-it X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 8baa6eb2275a53be011358564ed91c357fbb922b X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20171018232146.84B1A81BFD@gitbox.apache.org> archived-at: Wed, 18 Oct 2017 23:21:49 -0000 This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceaccesssecurity-it.git commit 8baa6eb2275a53be011358564ed91c357fbb922b Author: Carsten Ziegeler AuthorDate: Tue Jul 29 12:48:12 2014 +0000 Clean up usage of SCR annotations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1614328 13f79535-47bb-0310-9956-ffa450edef68 --- .../resourceaccesssecurity/it/impl/gates/ApplicationGate1.java | 4 ++-- .../resourceaccesssecurity/it/impl/gates/ApplicationGate2.java | 4 ++-- .../it/impl/gates/ApplicationGateDefault.java | 4 ++-- .../resourceaccesssecurity/it/impl/gates/FinalApplicationGate1.java | 4 ++-- .../resourceaccesssecurity/it/impl/gates/FinalApplicationGate2.java | 4 ++-- .../resourceaccesssecurity/it/impl/gates/FinalProviderGate1.java | 6 +++--- .../resourceaccesssecurity/it/impl/gates/FinalProviderGate2.java | 6 +++--- .../sling/resourceaccesssecurity/it/impl/gates/ProviderGate1.java | 4 ++-- .../sling/resourceaccesssecurity/it/impl/gates/ProviderGate2.java | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate1.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate1.java index 766875f..c90a332 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate1.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate1.java @@ -35,8 +35,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(app|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.OPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.OPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT) }) public class ApplicationGate1 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate2.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate2.java index 899e585..b428565 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate2.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGate2.java @@ -35,8 +35,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(app|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.OPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.OPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT) }) public class ApplicationGate2 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGateDefault.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGateDefault.java index 51fdd83..6f7be62 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGateDefault.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ApplicationGateDefault.java @@ -36,8 +36,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="^((?!(/test/secured-provider/read|/test/unsecured-provider/read)).*|/test/(un|)secured-provider/read(-update|)/prov/.*)", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.OPERATIONS, value="", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.OPERATIONS, value=""), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT) }) public class ApplicationGateDefault extends AllowingResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate1.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate1.java index c31eba2..81e2616 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate1.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate1.java @@ -35,8 +35,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(app|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT) }) public class FinalApplicationGate1 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate2.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate2.java index 05f6646..caf41ac 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate2.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalApplicationGate2.java @@ -35,8 +35,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(app|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.APPLICATION_CONTEXT) }) public class FinalApplicationGate2 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate1.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate1.java index 34f1b28..00785aa 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate1.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate1.java @@ -36,9 +36,9 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(prov|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update", propertyPrivate=true), - @Property(name = Constants.SERVICE_RANKING, intValue = 10, propertyPrivate = false), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update"), + @Property(name = Constants.SERVICE_RANKING, intValue = 10), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT) }) public class FinalProviderGate1 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate2.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate2.java index d6653a7..156efb1 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate2.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/FinalProviderGate2.java @@ -36,9 +36,9 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(prov|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update", propertyPrivate=true), - @Property(name = Constants.SERVICE_RANKING, intValue = 5, propertyPrivate = false), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.FINALOPERATIONS, value="read,update"), + @Property(name = Constants.SERVICE_RANKING, intValue = 5), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT) }) public class FinalProviderGate2 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate1.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate1.java index 10e2a13..3befff6 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate1.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate1.java @@ -29,8 +29,8 @@ import org.apache.sling.resourceaccesssecurity.ResourceAccessGate; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(prov|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.OPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.OPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT) }) public class ProviderGate1 extends AResourceAccessGate implements ResourceAccessGate { diff --git a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate2.java b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate2.java index a397bd2..9e9dae5 100644 --- a/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate2.java +++ b/src/main/java/org/apache/sling/resourceaccesssecurity/it/impl/gates/ProviderGate2.java @@ -35,8 +35,8 @@ import java.util.Map; @Properties({ @Property(name=ResourceAccessGate.PATH, label="Path", value="/test/(un|)secured-provider/read(-update|)/(prov|mixed)/.*", description="The path is a regular expression for which resources the service should be called"), - @Property(name=ResourceAccessGate.OPERATIONS, value="read,update", propertyPrivate=true), - @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT, propertyPrivate=true) + @Property(name=ResourceAccessGate.OPERATIONS, value="read,update"), + @Property(name=ResourceAccessGate.CONTEXT, value=ResourceAccessGate.PROVIDER_CONTEXT) }) public class ProviderGate2 extends AResourceAccessGate implements ResourceAccessGate { -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" .