commit f0e925a367a2d62a35ac90c65fc475428259cfcf
author Carsten Ziegeler <cziegeler@apache.org> Tue Jul 29 12:24:27 2014 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Tue Jul 29 12:24:27 2014 +0000
tree a880336c8cf070886a229d3530ff790f3746ebfb
parent 12c9c8ed6c93233c17cd8abdede876e3609f64a1

Clean up usage of SCR annotations

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1614323 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java

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 @@
  * <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})

src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java

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 @@
  * </pre>
  * </code>
  */
-@Component (immediate=true,
-		label="%getAcl.get.operation.name",
-		description="%getAcl.get.operation.description"
-)
+@Component
 @Service (value={
 		Servlet.class,
 		GetAcl.class

src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java

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 @@
  * </pre>
  * </code>
  */
-@Component (immediate=true,
-		label="%getEffectiveAcl.get.operation.name",
-		description="%getEffectiveAcl.get.operation.description"
-)
+@Component
 @Service (value={
 		Servlet.class,
 		GetEffectiveAcl.class

src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java

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 @@
  * 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