You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2011/11/30 04:30:21 UTC
svn commit: r1208235 - in /sling/trunk/bundles/jcr/jackrabbit-accessmanager:
./ src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/
Author: enorman
Date: Wed Nov 30 03:30:19 2011
New Revision: 1208235
URL: http://svn.apache.org/viewvc?rev=1208235&view=rev
Log:
SLING-2309 AccessManager - Convert @scr Java Doc Tags to SCR Annotations
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml?rev=1208235&r1=1208234&r2=1208235&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml Wed Nov 30 03:30:19 2011
@@ -144,5 +144,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.6.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
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=1208235&r1=1208234&r2=1208235&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 Wed Nov 30 03:30:19 2011
@@ -28,7 +28,12 @@ import javax.jcr.Session;
import javax.jcr.security.AccessControlEntry;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
+import javax.servlet.Servlet;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.servlets.HtmlResponse;
@@ -67,15 +72,21 @@ import org.apache.sling.servlets.post.Sl
* <dt>500</dt>
* <dd>Failure. HTML explains the failure.</dd>
* </dl>
- *
- * @scr.component immediate="true" label="%deleteAces.post.operation.name"
- * description="%deleteAces.post.operation.description"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.service interface="org.apache.sling.jcr.jackrabbit.accessmanager.DeleteAces"
- * @scr.property name="sling.servlet.resourceTypes" value="sling/servlet/default"
- * @scr.property name="sling.servlet.methods" value="POST"
- * @scr.property name="sling.servlet.selectors" value="deleteAce"
*/
+@Component (immediate=true,
+ label="%deleteAces.post.operation.name",
+ description="%deleteAces.post.operation.description")
+@Service (value={
+ Servlet.class,
+ DeleteAces.class})
+@Properties ({
+ @Property (name="sling.servlet.resourceTypes",
+ value="sling/servlet/default"),
+ @Property (name="sling.servlet.methods",
+ value="POST"),
+ @Property (name="sling.servlet.selectors",
+ value="deleteAce")
+})
public class DeleteAcesServlet extends AbstractAccessPostServlet implements DeleteAces {
private static final long serialVersionUID = 3784866802938282971L;
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=1208235&r1=1208234&r2=1208235&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 Wed Nov 30 03:30:19 2011
@@ -22,7 +22,12 @@ import javax.jcr.security.AccessControlE
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
+import javax.servlet.Servlet;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.jcr.base.util.AccessControlUtil;
@@ -92,16 +97,25 @@ import org.apache.sling.jcr.jackrabbit.a
* }
* </pre>
* </code>
- *
- * @scr.component immediate="true" label="%getAcl.get.operation.name"
- * description="%getAcl.get.operation.description"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.service interface="org.apache.sling.jcr.jackrabbit.accessmanager.GetAcl"
- * @scr.property name="sling.servlet.resourceTypes" value="sling/servlet/default"
- * @scr.property name="sling.servlet.methods" value="GET"
- * @scr.property name="sling.servlet.selectors" value="acl"
- * @scr.property name="sling.servlet.extensions" value="json"
*/
+@Component (immediate=true,
+ label="%getAcl.get.operation.name",
+ description="%getAcl.get.operation.description"
+)
+@Service (value={
+ Servlet.class,
+ GetAcl.class
+})
+@Properties ({
+ @Property (name="sling.servlet.resourceTypes",
+ value="sling/servlet/default"),
+ @Property (name="sling.servlet.methods",
+ value="GET"),
+ @Property (name="sling.servlet.selectors",
+ value="acl"),
+ @Property (name="sling.servlet.extensions",
+ value="json"),
+})
public class GetAclServlet extends AbstractGetAclServlet implements GetAcl {
private static final long serialVersionUID = 3391376559396223185L;
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=1208235&r1=1208234&r2=1208235&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 Wed Nov 30 03:30:19 2011
@@ -22,7 +22,12 @@ import javax.jcr.security.AccessControlE
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
+import javax.servlet.Servlet;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
import org.apache.sling.jcr.base.util.AccessControlUtil;
@@ -92,16 +97,25 @@ import org.apache.sling.jcr.jackrabbit.a
* }
* </pre>
* </code>
- *
- * @scr.component immediate="true" label="%getEffectiveAcl.get.operation.name"
- * description="%getEffectiveAcl.get.operation.description"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.service interface="org.apache.sling.jcr.jackrabbit.accessmanager.GetEffectiveAcl"
- * @scr.property name="sling.servlet.resourceTypes" value="sling/servlet/default"
- * @scr.property name="sling.servlet.methods" value="GET"
- * @scr.property name="sling.servlet.selectors" value="eacl"
- * @scr.property name="sling.servlet.extensions" value="json"
*/
+@Component (immediate=true,
+ label="%getEffectiveAcl.get.operation.name",
+ description="%getEffectiveAcl.get.operation.description"
+)
+@Service (value={
+ Servlet.class,
+ GetEffectiveAcl.class
+})
+@Properties ({
+ @Property (name="sling.servlet.resourceTypes",
+ value="sling/servlet/default"),
+ @Property (name="sling.servlet.methods",
+ value="GET"),
+ @Property (name="sling.servlet.selectors",
+ value="eacl"),
+ @Property (name="sling.servlet.extensions",
+ value="json"),
+})
@SuppressWarnings("serial")
public class GetEffectiveAclServlet extends AbstractGetAclServlet implements GetEffectiveAcl {
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=1208235&r1=1208234&r2=1208235&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 Wed Nov 30 03:30:19 2011
@@ -28,7 +28,12 @@ import java.util.Map.Entry;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.servlet.Servlet;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.ResourceNotFoundException;
@@ -77,15 +82,23 @@ import org.apache.sling.servlets.post.Mo
* the UserManager. This can be a group or a user, but if its a group, denied permissions
* will not be added to the group. The group will only contain granted privileges.
* </p>
- *
- * @scr.component immediate="true" label="%modifyAce.post.operation.name"
- * description="%modifyAce.post.operation.description"
- * @scr.service interface="javax.servlet.Servlet"
- * @scr.service interface="org.apache.sling.jcr.jackrabbit.accessmanager.ModifyAce"
- * @scr.property name="sling.servlet.resourceTypes" value="sling/servlet/default"
- * @scr.property name="sling.servlet.methods" value="POST"
- * @scr.property name="sling.servlet.selectors" value="modifyAce"
*/
+@Component (immediate=true,
+ label="%modifyAce.post.operation.name",
+ description="%modifyAce.post.operation.description"
+)
+@Service (value={
+ Servlet.class,
+ ModifyAce.class
+})
+@Properties ({
+ @Property (name="sling.servlet.resourceTypes",
+ value="sling/servlet/default"),
+ @Property (name="sling.servlet.methods",
+ value="POST"),
+ @Property (name="sling.servlet.selectors",
+ value="modifyAce")
+})
public class ModifyAceServlet extends AbstractAccessPostServlet implements ModifyAce {
private static final long serialVersionUID = -9182485466670280437L;