This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.jackrabbit.accessmanager-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-accessmanager.git
commit 625d59bb87bda27ea47bc8af17708d1c7bf557ac Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue Jul 29 12:24:27 2014 +0000 Clean up usage of SCR annotations git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-accessmanager@1614323 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java | 4 +--- .../sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java | 5 +---- .../jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java | 5 +---- .../sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java | 5 +---- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java index 797c561..21afaaa 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java @@ -74,9 +74,7 @@ import org.apache.sling.servlets.post.SlingPostConstants; * <dd>Failure. HTML explains the failure.</dd> * </dl> */ -@Component (immediate=true, - label="%deleteAces.post.operation.name", - description="%deleteAces.post.operation.description") +@Component @Service (value={ Servlet.class, DeleteAces.class}) diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java index 2b8b772..e7ed2b3 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java @@ -101,10 +101,7 @@ import org.apache.sling.jcr.jackrabbit.accessmanager.GetAcl; * </pre> * </code> */ -@Component (immediate=true, - label="%getAcl.get.operation.name", - description="%getAcl.get.operation.description" -) +@Component @Service (value={ Servlet.class, GetAcl.class diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java index 23d0a30..a3c5a29 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java @@ -101,10 +101,7 @@ import org.apache.sling.jcr.jackrabbit.accessmanager.GetEffectiveAcl; * </pre> * </code> */ -@Component (immediate=true, - label="%getEffectiveAcl.get.operation.name", - description="%getEffectiveAcl.get.operation.description" -) +@Component @Service (value={ Servlet.class, GetEffectiveAcl.class diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java index 3b7086e..023562b 100644 --- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java +++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java @@ -84,10 +84,7 @@ import org.apache.sling.servlets.post.Modification; * will not be added to the group. The group will only contain granted privileges. * </p> */ -@Component (immediate=true, - label="%modifyAce.post.operation.name", - description="%modifyAce.post.operation.description" -) +@Component @Service (value={ Servlet.class, ModifyAce.class -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
