You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/07/29 14:24:27 UTC
svn commit: r1614323 - in
/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post:
DeleteAcesServlet.java GetAclServlet.java GetEffectiveAclServlet.java
ModifyAceServlet.java
Author: cziegeler
Date: Tue Jul 29 12:24:27 2014
New Revision: 1614323
URL: http://svn.apache.org/r1614323
Log:
Clean up usage of SCR annotations
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java?rev=1614323&r1=1614322&r2=1614323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/DeleteAcesServlet.java Tue Jul 29 12:24:27 2014
@@ -74,9 +74,7 @@ import org.apache.sling.servlets.post.Sl
* <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})
Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java?rev=1614323&r1=1614322&r2=1614323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetAclServlet.java Tue Jul 29 12:24:27 2014
@@ -101,10 +101,7 @@ import org.apache.sling.jcr.jackrabbit.a
* </pre>
* </code>
*/
-@Component (immediate=true,
- label="%getAcl.get.operation.name",
- description="%getAcl.get.operation.description"
-)
+@Component
@Service (value={
Servlet.class,
GetAcl.class
Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java?rev=1614323&r1=1614322&r2=1614323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/GetEffectiveAclServlet.java Tue Jul 29 12:24:27 2014
@@ -101,10 +101,7 @@ import org.apache.sling.jcr.jackrabbit.a
* </pre>
* </code>
*/
-@Component (immediate=true,
- label="%getEffectiveAcl.get.operation.name",
- description="%getEffectiveAcl.get.operation.description"
-)
+@Component
@Service (value={
Servlet.class,
GetEffectiveAcl.class
Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java?rev=1614323&r1=1614322&r2=1614323&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java Tue Jul 29 12:24:27 2014
@@ -84,10 +84,7 @@ import org.apache.sling.servlets.post.Mo
* 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