Author: fmeschbe
Date: Tue Jun 9 10:25:51 2009
New Revision: 782947
URL: http://svn.apache.org/viewvc?rev=782947&view=rev
Log:
SLING-995 Applying patch by Ian Boston (thanks)
Modified:
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResource.java
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResourceProvider.java
Modified:
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResource.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResource.java?rev=782947&r1=782946&r2=782947&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResource.java
(original)
+++
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResource.java
Tue Jun 9 10:25:51 2009
@@ -49,9 +49,9 @@
this.authorizable = authorizable;
this.path = path;
if (authorizable.isGroup()) {
- this.resourceType = "sling:group";
+ this.resourceType = "sling/group";
} else {
- this.resourceType = "sling:user";
+ this.resourceType = "sling/user";
}
this.metadata = new ResourceMetadata();
Modified:
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResourceProvider.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResourceProvider.java?rev=782947&r1=782946&r2=782947&view=diff
==============================================================================
---
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResourceProvider.java
(original)
+++
incubator/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/resource/AuthorizableResourceProvider.java
Tue Jun 9 10:25:51 2009
@@ -93,11 +93,11 @@
// handle resources for the virtual container resources
if (path.equals(SYSTEM_USER_MANAGER_PATH)) {
return new SyntheticResource(resourceResolver, path,
- "sling:userManager");
+ "sling/userManager");
} else if (path.equals(SYSTEM_USER_MANAGER_USER_PATH)) {
- return new SyntheticResource(resourceResolver, path,
"sling:users");
+ return new SyntheticResource(resourceResolver, path,
"sling/users");
} else if (path.equals(SYSTEM_USER_MANAGER_GROUP_PATH)) {
- return new SyntheticResource(resourceResolver, path,
"sling:groups");
+ return new SyntheticResource(resourceResolver, path,
"sling/groups");
}
// the principalId should be the first segment after the prefix