You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2011/12/02 04:08:40 UTC
svn commit: r1209347 - in /sling/trunk/bundles/jcr/jackrabbit-usermanager:
pom.xml
src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
Author: justin
Date: Fri Dec 2 03:08:39 2011
New Revision: 1209347
URL: http://svn.apache.org/viewvc?rev=1209347&view=rev
Log:
SLING-2312 - adding adapter annotations in usermanager bundle
Modified:
sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml?rev=1209347&r1=1209346&r2=1209347&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Fri Dec 2 03:08:39 2011
@@ -55,6 +55,20 @@
<artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-sling-plugin</artifactId>
+ <version>2.0.7-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>generate-adapter-metadata</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>generate-adapter-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
@@ -132,6 +146,12 @@
<version>1.6.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>adapter-annotations</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java?rev=1209347&r1=1209346&r2=1209347&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java Fri Dec 2 03:08:39 2011
@@ -23,6 +23,8 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
+import org.apache.sling.adapter.annotations.Adaptable;
+import org.apache.sling.adapter.annotations.Adapter;
import org.apache.sling.api.resource.AbstractResource;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
@@ -32,6 +34,11 @@ import org.apache.sling.api.resource.Val
/**
* Resource implementation for Authorizable
*/
+@Adaptable(adaptableClass = Resource.class, adapters = {
+ @Adapter({Map.class, ValueMap.class, Authorizable.class}),
+ @Adapter(condition="If the resource is an AuthorizableResource and represents a JCR User", value = User.class),
+ @Adapter(condition="If the resource is an AuthorizableResource and represents a JCR Group", value = Group.class)
+})
public class AuthorizableResource extends AbstractResource implements Resource {
private Authorizable authorizable = null;