You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/10/18 23:21:54 UTC

[sling-org-apache-sling-resourceaccesssecurity-it] 08/24: Clean up usage of SCR annotations

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 <cz...@apache.org>
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" <co...@sling.apache.org>.