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 2017/01/11 13:43:46 UTC
svn commit: r1778291 - in /sling/trunk/bundles/jcr/jackrabbit-usermanager:
./ src/main/java/org/apache/sling/jackrabbit/usermanager/
src/main/java/org/apache/sling/jackrabbit/usermanager/impl/
src/main/java/org/apache/sling/jackrabbit/usermanager/impl/...
Author: cziegeler
Date: Wed Jan 11 13:43:46 2017
New Revision: 1778291
URL: http://svn.apache.org/viewvc?rev=1778291&view=rev
Log:
SLING-6451 : Remove dependency to jcr.resource API
Added:
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java (with props)
Removed:
sling/trunk/bundles/jcr/jackrabbit-usermanager/LICENSE
sling/trunk/bundles/jcr/jackrabbit-usermanager/NOTICE
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractUserPostServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/resources/
Modified:
sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResourceProvider.java
sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.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=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Wed Jan 11 13:43:46 2017
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -73,12 +73,6 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.sling.jackrabbit.usermanager;version=2.2.1,
- </Export-Package>
- <Private-Package>
- org.apache.sling.jackrabbit.usermanager.impl.*
- </Private-Package>
<Embed-Dependency>
org.apache.sling.servlets.post;inline="org/apache/sling/servlets/post/impl/helper/RequestProperty*
|org/apache/sling/servlets/post/impl/helper/DateParser*
@@ -93,12 +87,12 @@
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>2.11.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -125,16 +119,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.6</version>
+ <version>2.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -147,11 +137,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>adapter-annotations</artifactId>
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java Wed Jan 11 13:43:46 2017
@@ -19,15 +19,13 @@ package org.apache.sling.jackrabbit.user
import java.io.UnsupportedEncodingException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
-import java.util.Dictionary;
+import java.util.Collection;
+import java.util.Map;
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.Property;
-import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -37,7 +35,8 @@ import org.apache.sling.jcr.base.util.Ac
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,8 +52,11 @@ import org.slf4j.LoggerFactory;
* her/his group membership,</li>
* </ul>
*/
-@Component (immediate=true)
-@Service (value=AuthorizablePrivilegesInfo.class)
+@Component(service=AuthorizablePrivilegesInfo.class,
+ property={
+ AuthorizablePrivilegesInfoImpl.PAR_USER_ADMIN_GROUP_NAME + "=" + AuthorizablePrivilegesInfoImpl.DEFAULT_USER_ADMIN_GROUP_NAME,
+ AuthorizablePrivilegesInfoImpl.PAR_GROUP_ADMIN_GROUP_NAME + "=" + AuthorizablePrivilegesInfoImpl.DEFAULT_GROUP_ADMIN_GROUP_NAME
+ })
public class AuthorizablePrivilegesInfoImpl implements AuthorizablePrivilegesInfo {
/** default log */
@@ -65,28 +67,26 @@ public class AuthorizablePrivilegesInfoI
*
* @see #PAR_USER_ADMIN_GROUP_NAME
*/
- private static final String DEFAULT_USER_ADMIN_GROUP_NAME = "UserAdmin";
+ static final String DEFAULT_USER_ADMIN_GROUP_NAME = "UserAdmin";
/**
* The name of the configuration parameter providing the
* 'User administrator' group name.
*/
- @Property (value=DEFAULT_USER_ADMIN_GROUP_NAME)
- private static final String PAR_USER_ADMIN_GROUP_NAME = "user.admin.group.name";
+ static final String PAR_USER_ADMIN_GROUP_NAME = "user.admin.group.name";
/**
* The default 'User administrator' group name
*
* @see #PAR_GROUP_ADMIN_GROUP_NAME
*/
- private static final String DEFAULT_GROUP_ADMIN_GROUP_NAME = "GroupAdmin";
+ static final String DEFAULT_GROUP_ADMIN_GROUP_NAME = "GroupAdmin";
/**
* The name of the configuration parameter providing the
* 'Group administrator' group name.
*/
- @Property (value=DEFAULT_GROUP_ADMIN_GROUP_NAME)
- private static final String PAR_GROUP_ADMIN_GROUP_NAME = "group.admin.group.name";
+ static final String PAR_GROUP_ADMIN_GROUP_NAME = "group.admin.group.name";
/* (non-Javadoc)
* @see org.apache.sling.jackrabbit.usermanager.AuthorizablePrivilegesInfo#canAddGroup(javax.jcr.Session)
@@ -113,13 +113,12 @@ public class AuthorizablePrivilegesInfoI
public boolean canAddUser(Session jcrSession) {
try {
//if self-registration is enabled, then anyone can create a user
- if (componentContext != null) {
+ if (bundleContext != null) {
String filter = "(&(sling.servlet.resourceTypes=sling/users)(|(sling.servlet.methods=POST)(sling.servlet.selectors=create)))";
- BundleContext bundleContext = componentContext.getBundleContext();
- ServiceReference[] serviceReferences = bundleContext.getServiceReferences(Servlet.class.getName(), filter);
+ Collection<ServiceReference<Servlet>> serviceReferences = bundleContext.getServiceReferences(Servlet.class, filter);
if (serviceReferences != null) {
String propName = "self.registration.enabled";
- for (ServiceReference serviceReference : serviceReferences) {
+ for (ServiceReference<Servlet> serviceReference : serviceReferences) {
Object propValue = serviceReference.getProperty(propName);
if (propValue != null) {
boolean selfRegEnabled = Boolean.TRUE.equals(propValue);
@@ -207,7 +206,7 @@ public class AuthorizablePrivilegesInfoI
// ---------- SCR Integration ----------------------------------------------
//keep track of the bundle context
- private ComponentContext componentContext;
+ private BundleContext bundleContext;
/**
* Called by SCR to activate the component.
@@ -217,14 +216,13 @@ public class AuthorizablePrivilegesInfoI
* @throws IllegalStateException
* @throws UnsupportedEncodingException
*/
- protected void activate(ComponentContext componentContext)
+ @Activate
+ protected void activate(BundleContext bundleContext, Map<String, Object> properties)
throws InvalidKeyException, NoSuchAlgorithmException,
IllegalStateException, UnsupportedEncodingException {
- this.componentContext = componentContext;
+ this.bundleContext = bundleContext;
- Dictionary<?, ?> properties = componentContext.getProperties();
-
String userAdminGroupName = OsgiUtil.toString(properties.get(PAR_USER_ADMIN_GROUP_NAME), null);
if ( userAdminGroupName != null && ! DEFAULT_USER_ADMIN_GROUP_NAME.equals(userAdminGroupName)) {
log.warn("Configuration setting for {} is deprecated and will not have any effect", PAR_USER_ADMIN_GROUP_NAME);
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java Wed Jan 11 13:43:46 2017
@@ -20,7 +20,6 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Calendar;
-import java.util.Dictionary;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -42,7 +41,6 @@ import org.apache.sling.servlets.post.Mo
import org.apache.sling.servlets.post.SlingPostConstants;
import org.apache.sling.servlets.post.impl.helper.DateParser;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
-import org.osgi.service.component.ComponentContext;
/**
* Base class for all the POST servlets for the UserManager operations
@@ -57,9 +55,7 @@ public abstract class AbstractAuthorizab
// ---------- SCR Integration ----------------------------------------------
- protected void activate(ComponentContext context) {
- Dictionary<?, ?> props = context.getProperties();
-
+ protected void activate(Map<String, Object> props) {
dateParser = new DateParser();
String[] dateFormats = OsgiUtil.toStringArray(props.get(PROP_DATE_FORMAT));
for (String dateFormat : dateFormats) {
@@ -67,7 +63,7 @@ public abstract class AbstractAuthorizab
}
}
- protected void deactivate(ComponentContext context) {
+ protected void deactivate() {
dateParser = null;
}
@@ -671,6 +667,12 @@ public abstract class AbstractAuthorizab
}
@Override
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
public String toString() {
return this.getString();
}
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java Wed Jan 11 13:43:46 2017
@@ -16,20 +16,13 @@
*/
package org.apache.sling.jackrabbit.usermanager.impl.post;
-import java.lang.reflect.Method;
-import java.util.Dictionary;
import java.util.List;
+import java.util.Map;
-import javax.jcr.Credentials;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
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.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -43,7 +36,9 @@ import org.apache.sling.jackrabbit.userm
import org.apache.sling.jcr.base.util.AccessControlUtil;
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
-import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,31 +79,21 @@ import org.slf4j.LoggerFactory;
*
* <h4>Notes</h4>
*/
-@Component (metatype=true,
- label="%changeUserPassword.post.operation.name",
- description="%changeUserPassword.post.operation.description")
-@Service (value={
- Servlet.class,
- ChangeUserPassword.class
-})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value="sling/user"),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="changePassword"),
- @Property (name=AbstractAuthorizablePostServlet.PROP_DATE_FORMAT,
- value={
- "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
- "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
- "yyyy-MM-dd'T'HH:mm:ss",
- "yyyy-MM-dd",
- "dd.MM.yyyy HH:mm:ss",
- "dd.MM.yyyy"
- })
-})
-public class ChangeUserPasswordServlet extends AbstractUserPostServlet implements ChangeUserPassword {
+
+@Component(service = {Servlet.class, ChangeUserPassword.class},
+ property = {
+ "sling.servlet.resourceTypes=sling/user",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=changePassword",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy",
+ ChangeUserPasswordServlet.PAR_USER_ADMIN_GROUP_NAME + "=" + ChangeUserPasswordServlet.DEFAULT_USER_ADMIN_GROUP_NAME
+ })
+public class ChangeUserPasswordServlet extends AbstractAuthorizablePostServlet implements ChangeUserPassword {
private static final long serialVersionUID = 1923614318474654502L;
/**
@@ -121,15 +106,14 @@ public class ChangeUserPasswordServlet e
*
* @see #PAR_USER_ADMIN_GROUP_NAME
*/
- private static final String DEFAULT_USER_ADMIN_GROUP_NAME = "UserAdmin";
+ static final String DEFAULT_USER_ADMIN_GROUP_NAME = "UserAdmin";
/**
* The name of the configuration parameter providing the
* name of the group whose members are allowed to reset the password
* of a user without the 'oldPwd' value.
*/
- @Property (value=DEFAULT_USER_ADMIN_GROUP_NAME)
- private static final String PAR_USER_ADMIN_GROUP_NAME = "user.admin.group.name";
+ static final String PAR_USER_ADMIN_GROUP_NAME = "user.admin.group.name";
private String userAdminGroupName = DEFAULT_USER_ADMIN_GROUP_NAME;
@@ -138,22 +122,22 @@ public class ChangeUserPasswordServlet e
/**
* Activates this component.
*
- * @param componentContext The OSGi <code>ComponentContext</code> of this
- * component.
+ * @param props The component properties
*/
@Override
- protected void activate(ComponentContext componentContext) {
- super.activate(componentContext);
- Dictionary<?, ?> props = componentContext.getProperties();
+ @Activate
+ protected void activate(final Map<String, Object> props) {
+ super.activate(props);
this.userAdminGroupName = OsgiUtil.toString(props.get(PAR_USER_ADMIN_GROUP_NAME),
DEFAULT_USER_ADMIN_GROUP_NAME);
- log.info("User Admin Group Name {}", this.userAdminGroupName);
+ log.debug("User Admin Group Name {}", this.userAdminGroupName);
}
@Override
- protected void deactivate(ComponentContext context) {
- super.deactivate(context);
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
}
/*
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java Wed Jan 11 13:43:46 2017
@@ -17,6 +17,7 @@
package org.apache.sling.jackrabbit.usermanager.impl.post;
import java.security.Principal;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -24,26 +25,25 @@ 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.Reference;
-import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.servlets.HtmlResponse;
+import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.jackrabbit.usermanager.CreateGroup;
import org.apache.sling.jackrabbit.usermanager.impl.resource.AuthorizableResourceProvider;
import org.apache.sling.jcr.base.util.AccessControlUtil;
-import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.SlingPostConstants;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
/**
* <p>
@@ -83,36 +83,37 @@ import org.apache.sling.servlets.post.im
*
* <h4>Notes</h4>
*/
-@Component (immediate=true, metatype=true,
- label="%createGroup.post.operation.name",
- description="%createGroup.post.operation.description")
-@Service (value={
- Servlet.class,
- CreateGroup.class
-})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value="sling/groups"),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="create"),
- @Property (name=AbstractAuthorizablePostServlet.PROP_DATE_FORMAT,
- value={
- "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
- "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
- "yyyy-MM-dd'T'HH:mm:ss",
- "yyyy-MM-dd",
- "dd.MM.yyyy HH:mm:ss",
- "dd.MM.yyyy"
- })
+
+@Component(service = {Servlet.class, CreateGroup.class},
+property = {
+ "sling.servlet.resourceTypes=sling/groups",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=create",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy"
})
public class CreateGroupServlet extends AbstractGroupPostServlet implements CreateGroup {
private static final long serialVersionUID = -1084915263933901466L;
@Reference
- private JcrResourceResolverFactory resourceResolverFactory;
+ private ResourceResolverFactory resourceResolverFactory;
+ @Override
+ @Activate
+ protected void activate(final Map<String, Object> props) {
+ super.activate(props);
+ }
+
+ @Override
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
/*
* (non-Javadoc)
* @see
@@ -186,10 +187,14 @@ public class CreateGroupServlet extends
ResourceResolver resourceResolver = null;
try {
//create a resource resolver to resolve the relative paths used for group membership values
- resourceResolver = resourceResolverFactory.getResourceResolver(jcrSession);
+ final Map<String, Object> authInfo = new HashMap<String, Object>();
+ authInfo.put(org.apache.sling.jcr.resource.api.JcrResourceConstants.AUTHENTICATION_INFO_SESSION, jcrSession);
+ resourceResolver = resourceResolverFactory.getResourceResolver(authInfo);
Resource baseResource = resourceResolver.getResource(AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PATH);
updateGroupMembership(baseResource, properties, group, changes);
- } finally {
+ } catch (LoginException e) {
+ throw new RepositoryException(e);
+ } finally {
if (resourceResolver != null) {
resourceResolver.close();
}
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java Wed Jan 11 13:43:46 2017
@@ -16,7 +16,6 @@
*/
package org.apache.sling.jackrabbit.usermanager.impl.post;
-import java.util.Dictionary;
import java.util.List;
import java.util.Map;
@@ -24,11 +23,6 @@ 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.Reference;
-import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -44,7 +38,13 @@ import org.apache.sling.servlets.post.Mo
import org.apache.sling.servlets.post.ModificationType;
import org.apache.sling.servlets.post.SlingPostConstants;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
-import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,62 +87,40 @@ import org.slf4j.LoggerFactory;
* curl -F:name=ieb -Fpwd=password -FpwdConfirm=password -Fproperty1=value1 http://localhost:8080/system/userManager/user.create.html
* </code>
*/
-@Component (metatype=true,
- label="%createUser.post.operation.name",
- description="%createUser.post.operation.description")
-@Service(value={
- Servlet.class,
- CreateUser.class
+@Designate(ocd = CreateUserServlet.Config.class)
+@Component(service = {Servlet.class, CreateUser.class},
+ property = {
+ "sling.servlet.resourceTypes=sling/users",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=create",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy",
+ ChangeUserPasswordServlet.PAR_USER_ADMIN_GROUP_NAME + "=" + ChangeUserPasswordServlet.DEFAULT_USER_ADMIN_GROUP_NAME
})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value="sling/users"),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="create"),
- @Property (name=AbstractAuthorizablePostServlet.PROP_DATE_FORMAT,
- value={
- "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
- "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
- "yyyy-MM-dd'T'HH:mm:ss",
- "yyyy-MM-dd",
- "dd.MM.yyyy HH:mm:ss",
- "dd.MM.yyyy"
- })
-})
-public class CreateUserServlet extends AbstractUserPostServlet implements CreateUser {
+public class CreateUserServlet extends AbstractAuthorizablePostServlet implements CreateUser {
private static final long serialVersionUID = 6871481922737658675L;
+ @ObjectClassDefinition(name = "Apache Sling Create User",
+ description = "The Sling operation to handle create user requests in Sling.")
+ public @interface Config {
+
+ @AttributeDefinition(name = "Self-Registration Enabled",
+ description = "When selected, the anonymous user is allowed to register a new user with the system.")
+ boolean self_registration_enabled() default false;
+ }
+
/**
* default log
*/
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final boolean DEFAULT_SELF_REGISTRATION_ENABLED = false;
-
- @Property (label="%self.registration.enabled.name",
- description="%self.registration.enabled.description",
- boolValue=DEFAULT_SELF_REGISTRATION_ENABLED)
- private static final String PROP_SELF_REGISTRATION_ENABLED = "self.registration.enabled";
+ private boolean selfRegistrationEnabled;
- private Boolean selfRegistrationEnabled = DEFAULT_SELF_REGISTRATION_ENABLED;
-
- /**
- * The default 'User administrator' group name
- *
- * @see #PAR_USER_ADMIN_GROUP_NAME
- */
- private static final String DEFAULT_USER_ADMIN_GROUP_NAME = "UserAdmin";
-
- /**
- * The name of the configuration parameter providing the
- * 'User administrator' group name.
- */
- @Property (value=DEFAULT_USER_ADMIN_GROUP_NAME)
- private static final String PAR_USER_ADMIN_GROUP_NAME = "user.admin.group.name";
-
- private String userAdminGroupName = DEFAULT_USER_ADMIN_GROUP_NAME;
+ private String userAdminGroupName = ChangeUserPasswordServlet.DEFAULT_USER_ADMIN_GROUP_NAME;
/**
* The JCR Repository we access to resolve resources
@@ -175,30 +153,22 @@ public class CreateUserServlet extends A
/**
* Activates this component.
*
- * @param componentContext The OSGi <code>ComponentContext</code> of this
- * component.
+ * @param props The configuration properties
*/
- @Override
- protected void activate(ComponentContext componentContext) {
- super.activate(componentContext);
- Dictionary<?, ?> props = componentContext.getProperties();
- Object propValue = props.get(PROP_SELF_REGISTRATION_ENABLED);
- if (propValue instanceof Boolean) {
- selfRegistrationEnabled = (Boolean)propValue;
- } else if (propValue instanceof String) {
- selfRegistrationEnabled = Boolean.parseBoolean((String) propValue);
- } else {
- selfRegistrationEnabled = DEFAULT_SELF_REGISTRATION_ENABLED;
- }
-
- this.userAdminGroupName = OsgiUtil.toString(props.get(PAR_USER_ADMIN_GROUP_NAME),
- DEFAULT_USER_ADMIN_GROUP_NAME);
- log.info("User Admin Group Name {}", this.userAdminGroupName);
+ @Activate
+ protected void activate(Config config, Map<String, Object> props) {
+ super.activate(props);
+ selfRegistrationEnabled = config.self_registration_enabled();
+
+ this.userAdminGroupName = OsgiUtil.toString(props.get(ChangeUserPasswordServlet.PAR_USER_ADMIN_GROUP_NAME),
+ ChangeUserPasswordServlet.DEFAULT_USER_ADMIN_GROUP_NAME);
+ log.debug("User Admin Group Name {}", this.userAdminGroupName);
}
@Override
- protected void deactivate(ComponentContext context) {
- super.deactivate(context);
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
}
/*
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java Wed Jan 11 13:43:46 2017
@@ -25,10 +25,6 @@ import javax.jcr.Session;
import javax.servlet.Servlet;
import javax.servlet.http.HttpServletResponse;
-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.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -37,7 +33,6 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.servlets.HtmlResponse;
import org.apache.sling.jackrabbit.usermanager.DeleteAuthorizables;
import org.apache.sling.jackrabbit.usermanager.DeleteGroup;
import org.apache.sling.jackrabbit.usermanager.DeleteUser;
@@ -46,6 +41,7 @@ import org.apache.sling.jcr.base.util.Ac
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.SlingPostConstants;
+import org.osgi.service.component.annotations.Component;
/**
@@ -81,26 +77,14 @@ import org.apache.sling.servlets.post.Sl
* curl -Fgo=1 http://localhost:8080/system/userManager/user/ieb.delete.html
* </code>
*/
-@Component (immediate=true, metatype=true,
- label="%deleteAuthorizable.post.operation.name",
- description="%deleteAuthorizable.post.operation.description")
-@Service (value={
- Servlet.class,
- DeleteUser.class,
- DeleteGroup.class,
- DeleteAuthorizables.class
-})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value={
- "sling/user",
- "sling/group",
- "sling/userManager"
- }),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="delete")
+
+@Component(service = {Servlet.class, DeleteUser.class, DeleteGroup.class, DeleteAuthorizables.class},
+ property = {
+ "sling.servlet.resourceTypes=sling/user",
+ "sling.servlet.resourceTypes=sling/group",
+ "sling.servlet.resourceTypes=sling/userManager",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=delete"
})
public class DeleteAuthorizableServlet extends AbstractPostServlet
implements DeleteUser, DeleteGroup, DeleteAuthorizables {
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java Wed Jan 11 13:43:46 2017
@@ -16,6 +16,7 @@
*/
package org.apache.sling.jackrabbit.usermanager.impl.post;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -23,26 +24,25 @@ 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.Reference;
-import org.apache.felix.scr.annotations.Service;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.servlets.HtmlResponse;
+import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.jackrabbit.usermanager.UpdateGroup;
import org.apache.sling.jackrabbit.usermanager.impl.resource.AuthorizableResourceProvider;
import org.apache.sling.jcr.base.util.AccessControlUtil;
-import org.apache.sling.jcr.resource.JcrResourceResolverFactory;
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
/**
* <p>
@@ -83,37 +83,38 @@ import org.apache.sling.servlets.post.im
* curl -Fprop1=value2 -Fproperty1=value1 http://localhost:8080/system/userManager/group/testGroup.update.html
* </code>
*/
-@Component (immediate=true, metatype=true,
- label="%updateGroup.post.operation.name",
- description="%updateGroup.post.operation.description")
-@Service (value={
- Servlet.class,
- UpdateGroup.class
-})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value="sling/group"),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="update"),
- @Property (name=AbstractAuthorizablePostServlet.PROP_DATE_FORMAT,
- value={
- "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
- "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
- "yyyy-MM-dd'T'HH:mm:ss",
- "yyyy-MM-dd",
- "dd.MM.yyyy HH:mm:ss",
- "dd.MM.yyyy"
- })
+
+@Component(service = {Servlet.class, UpdateGroup.class},
+property = {
+ "sling.servlet.resourceTypes=sling/group",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=update",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy"
})
public class UpdateGroupServlet extends AbstractGroupPostServlet
implements UpdateGroup {
private static final long serialVersionUID = -8292054361992488797L;
@Reference
- private JcrResourceResolverFactory resourceResolverFactory;
+ private ResourceResolverFactory resourceResolverFactory;
+ @Override
+ @Activate
+ protected void activate(final Map<String, Object> props) {
+ super.activate(props);
+ }
+
+ @Override
+ @Deactivate
+ protected void deactivate() {
+ super.deactivate();
+ }
+
/*
* (non-Javadoc)
* @see
@@ -167,10 +168,14 @@ public class UpdateGroupServlet extends
ResourceResolver resourceResolver = null;
try {
//create a resource resolver to resolve the relative paths used for group membership values
- resourceResolver = resourceResolverFactory.getResourceResolver(jcrSession);
+ final Map<String, Object> authInfo = new HashMap<String, Object>();
+ authInfo.put(org.apache.sling.jcr.resource.api.JcrResourceConstants.AUTHENTICATION_INFO_SESSION, jcrSession);
+ resourceResolver = resourceResolverFactory.getResourceResolver(authInfo);
Resource baseResource = resourceResolver.getResource(groupPath);
updateGroupMembership(baseResource, properties, group, changes);
- } finally {
+ } catch (LoginException e) {
+ throw new RepositoryException(e);
+ } finally {
if (resourceResolver != null) {
resourceResolver.close();
}
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java Wed Jan 11 13:43:46 2017
@@ -23,10 +23,6 @@ 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.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -39,7 +35,9 @@ import org.apache.sling.jcr.base.util.Ac
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
-import org.osgi.service.component.ComponentContext;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
/**
* <p>
@@ -79,42 +77,34 @@ import org.osgi.service.component.Compon
* curl -Fprop1=value2 -Fproperty1=value1 http://localhost:8080/system/userManager/user/ieb.update.html
* </code>
*/
-@Component (metatype=true,
- label="%updateUser.post.operation.name",
- description="%updateUser.post.operation.description")
-@Service (value={
- Servlet.class,
- UpdateUser.class
-})
-@Properties ({
- @Property (name="sling.servlet.resourceTypes",
- value="sling/user"),
- @Property (name="sling.servlet.methods",
- value="POST"),
- @Property (name="sling.servlet.selectors",
- value="update"),
- @Property (name=AbstractAuthorizablePostServlet.PROP_DATE_FORMAT,
- value={
- "EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
- "yyyy-MM-dd'T'HH:mm:ss.SSSZ",
- "yyyy-MM-dd'T'HH:mm:ss",
- "yyyy-MM-dd",
- "dd.MM.yyyy HH:mm:ss",
- "dd.MM.yyyy"
- })
+
+@Component(service = {Servlet.class, UpdateUser.class},
+property = {
+ "sling.servlet.resourceTypes=sling/user",
+ "sling.servlet.methods=POST",
+ "sling.servlet.selectors=update",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=EEE MMM dd yyyy HH:mm:ss 'GMT'Z",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss.SSSZ",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd'T'HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=yyyy-MM-dd",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy HH:mm:ss",
+ AbstractAuthorizablePostServlet.PROP_DATE_FORMAT + "=dd.MM.yyyy"
})
-public class UpdateUserServlet extends AbstractUserPostServlet
+public class UpdateUserServlet extends AbstractAuthorizablePostServlet
implements UpdateUser {
- private static final long serialVersionUID = 5874621724096106496L;
+
+ private static final long serialVersionUID = 5874621724096106496L;
@Override
- protected void activate(ComponentContext context) {
- super.activate(context);
+ @Activate
+ protected void activate(final Map<String, Object> props) {
+ super.activate(props);
}
@Override
- protected void deactivate(ComponentContext context) {
- super.deactivate(context);
+ @Deactivate
+ protected void deactivate( ) {
+ super.deactivate();
}
/*
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResourceProvider.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResourceProvider.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResourceProvider.java Wed Jan 11 13:43:46 2017
@@ -23,41 +23,33 @@ import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.servlet.http.HttpServletRequest;
-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.PrincipalIterator;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.sling.api.SlingException;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.SyntheticResource;
import org.apache.sling.jcr.base.util.AccessControlUtil;
+import org.apache.sling.spi.resource.provider.ResolveContext;
+import org.apache.sling.spi.resource.provider.ResourceContext;
+import org.apache.sling.spi.resource.provider.ResourceProvider;
+import org.osgi.service.component.annotations.Component;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Resource Provider implementation for jackrabbit UserManager resources.
*/
-@Component (immediate=true, metatype=true,
- label="%authorizable.resourceprovider.name",
- description="%authorizable.resourceprovider.description")
-@Service (value=ResourceProvider.class)
-@Properties ({
- @Property (name="service.description",
- value="Resource provider implementation for UserManager resources"),
- @Property (name="service.vendor",
- value="The Apache Software Foundation"),
- @Property (name="provider.roots",
- value="/system/userManager/")
-})
-public class AuthorizableResourceProvider implements ResourceProvider {
+@Component(service = ResourceProvider.class,
+ property={
+ "service.description=Resource provider implementation for UserManager resources",
+ "service.vendor=The Apache Software Foundation",
+ ResourceProvider.PROPERTY_ROOT + "=" + AuthorizableResourceProvider.SYSTEM_USER_MANAGER_PATH
+ })
+public class AuthorizableResourceProvider extends ResourceProvider<Object> {
/**
* default log
@@ -78,34 +70,21 @@ public class AuthorizableResourceProvide
public static final String SYSTEM_USER_MANAGER_GROUP_PREFIX = SYSTEM_USER_MANAGER_GROUP_PATH
+ "/";
- /*
- * (non-Javadoc)
- * @see
- * org.apache.sling.api.resource.ResourceProvider#getResource(org.apache
- * .sling.api.resource.ResourceResolver,
- * javax.servlet.http.HttpServletRequest, java.lang.String)
- */
- public Resource getResource(ResourceResolver resourceResolver,
- HttpServletRequest request, String path) {
- return getResource(resourceResolver, path);
- }
-
- /*
- * (non-Javadoc)
- * @see
- * org.apache.sling.api.resource.ResourceProvider#getResource(org.apache
- * .sling.api.resource.ResourceResolver, java.lang.String)
- */
- public Resource getResource(ResourceResolver resourceResolver, String path) {
+
+ @Override
+ public Resource getResource(ResolveContext<Object> ctx,
+ String path,
+ ResourceContext resourceContext,
+ Resource parent) {
// handle resources for the virtual container resources
if (path.equals(SYSTEM_USER_MANAGER_PATH)) {
- return new SyntheticResource(resourceResolver, path,
+ return new SyntheticResource(ctx.getResourceResolver(), path,
"sling/userManager");
} else if (path.equals(SYSTEM_USER_MANAGER_USER_PATH)) {
- return new SyntheticResource(resourceResolver, path, "sling/users");
+ return new SyntheticResource(ctx.getResourceResolver(), path, "sling/users");
} else if (path.equals(SYSTEM_USER_MANAGER_GROUP_PATH)) {
- return new SyntheticResource(resourceResolver, path, "sling/groups");
+ return new SyntheticResource(ctx.getResourceResolver(), path, "sling/groups");
}
// the principalId should be the first segment after the prefix
@@ -122,7 +101,7 @@ public class AuthorizableResourceProvide
// out now.
}
try {
- Session session = resourceResolver.adaptTo(Session.class);
+ Session session = ctx.getResourceResolver().adaptTo(Session.class);
if (session != null) {
UserManager userManager = AccessControlUtil.getUserManager(session);
if (userManager != null) {
@@ -131,7 +110,7 @@ public class AuthorizableResourceProvide
// found the Authorizable, so return the resource
// that wraps it.
return new AuthorizableResource(authorizable,
- resourceResolver, path);
+ ctx.getResourceResolver(), path);
}
}
}
@@ -143,16 +122,8 @@ public class AuthorizableResourceProvide
return null;
}
- /*
- * (non-Javadoc)
- * @see
- * org.apache.sling.api.resource.ResourceProvider#listChildren(org.apache
- * .sling.api.resource.Resource)
- */
- public Iterator<Resource> listChildren(Resource parent) {
- if (parent == null) {
- throw new NullPointerException("parent is null");
- }
+ @Override
+ public Iterator<Resource> listChildren(ResolveContext<Object> ctx, Resource parent) {
try {
String path = parent.getPath();
ResourceResolver resourceResolver = parent.getResourceResolver();
@@ -161,10 +132,10 @@ public class AuthorizableResourceProvide
if (SYSTEM_USER_MANAGER_PATH.equals(path)) {
List<Resource> resources = new ArrayList<Resource>();
if (resourceResolver != null) {
- resources.add(getResource(resourceResolver,
- SYSTEM_USER_MANAGER_USER_PATH));
- resources.add(getResource(resourceResolver,
- SYSTEM_USER_MANAGER_GROUP_PATH));
+ resources.add(getResource(ctx,
+ SYSTEM_USER_MANAGER_USER_PATH, null, null));
+ resources.add(getResource(ctx,
+ SYSTEM_USER_MANAGER_GROUP_PATH, null, null));
}
return resources.iterator();
}
Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java?rev=1778291&r1=1778290&r2=1778291&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java Wed Jan 11 13:43:46 2017
@@ -16,6 +16,8 @@
*/
package org.apache.sling.jackrabbit.usermanager.impl.resource;
+import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Calendar;
@@ -28,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import javax.jcr.Property;
+import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
@@ -35,7 +38,6 @@ import javax.jcr.ValueFormatException;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.jcr.resource.JcrResourceUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -170,22 +172,51 @@ public class AuthorizableValueMap implem
return null;
}
+ /**
+ * Converts a JCR Value to a corresponding Java Object
+ *
+ * @param value the JCR Value to convert
+ * @return the Java Object
+ * @throws RepositoryException if the value cannot be converted
+ */
+ public static Object toJavaObject(Value value) throws RepositoryException {
+ switch (value.getType()) {
+ case PropertyType.DECIMAL:
+ return value.getDecimal();
+ case PropertyType.BINARY:
+ return new LazyInputStream(value);
+ case PropertyType.BOOLEAN:
+ return value.getBoolean();
+ case PropertyType.DATE:
+ return value.getDate();
+ case PropertyType.DOUBLE:
+ return value.getDouble();
+ case PropertyType.LONG:
+ return value.getLong();
+ case PropertyType.NAME: // fall through
+ case PropertyType.PATH: // fall through
+ case PropertyType.REFERENCE: // fall through
+ case PropertyType.STRING: // fall through
+ case PropertyType.UNDEFINED: // not actually expected
+ default: // not actually expected
+ return value.getString();
+ }
+ }
protected Object valuesToJavaObject(Value[] values)
throws RepositoryException {
if (values == null) {
return null;
} else if (values.length == 1) {
- return JcrResourceUtil.toJavaObject(values[0]);
+ return toJavaObject(values[0]);
} else {
Object[] valuesObjs = new Object[values.length];
for (int i = 0; i < values.length; i++) {
- valuesObjs[i] = JcrResourceUtil.toJavaObject(values[i]);
+ valuesObjs[i] = toJavaObject(values[i]);
}
return valuesObjs;
}
}
- @SuppressWarnings("unchecked")
protected void readFully() {
if (!fullyRead) {
try {
@@ -196,7 +227,7 @@ public class AuthorizableValueMap implem
cache.put(MEMBER_OF_KEY, getMemberships(authorizable, true));
cache.put(DECLARED_MEMBER_OF_KEY, getMemberships(authorizable, false));
- Iterator pi = authorizable.getPropertyNames();
+ Iterator<String> pi = authorizable.getPropertyNames();
while (pi.hasNext()) {
String key = (String) pi.next();
if (!cache.containsKey(key)) {
@@ -371,5 +402,89 @@ public class AuthorizableValueMap implem
}
return results.toArray(new String[results.size()]);
}
+
+ public static class LazyInputStream extends InputStream {
+
+ /** The JCR Value from which the input stream is requested on demand */
+ private final Value value;
+
+ /** The inputstream created on demand, null if not used */
+ private InputStream delegatee;
+
+ public LazyInputStream(Value value) {
+ this.value = value;
+ }
+
+ /**
+ * Closes the input stream if acquired otherwise does nothing.
+ */
+ @Override
+ public void close() throws IOException {
+ if (delegatee != null) {
+ delegatee.close();
+ }
+ }
+
+ @Override
+ public int available() throws IOException {
+ return getStream().available();
+ }
+
+ @Override
+ public int read() throws IOException {
+ return getStream().read();
+ }
+
+ @Override
+ public int read(byte[] b) throws IOException {
+ return getStream().read(b);
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ return getStream().read(b, off, len);
+ }
+ @Override
+ public long skip(long n) throws IOException {
+ return getStream().skip(n);
+ }
+
+ @Override
+ public boolean markSupported() {
+ try {
+ return getStream().markSupported();
+ } catch (IOException ioe) {
+ // ignore
+ }
+ return false;
+ }
+
+ @Override
+ public synchronized void mark(int readlimit) {
+ try {
+ getStream().mark(readlimit);
+ } catch (IOException ioe) {
+ // ignore
+ }
+ }
+
+ @Override
+ public synchronized void reset() throws IOException {
+ getStream().reset();
+ }
+
+ /** Actually retrieves the input stream from the underlying JCR Value */
+ private InputStream getStream() throws IOException {
+ if (delegatee == null) {
+ try {
+ delegatee = value.getBinary().getStream();
+ } catch (RepositoryException re) {
+ throw (IOException) new IOException(re.getMessage()).initCause(re);
+ }
+ }
+ return delegatee;
+ }
+
+ }
}
\ No newline at end of file
Added: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java?rev=1778291&view=auto
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java (added)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java Wed Jan 11 13:43:46 2017
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@org.osgi.annotation.versioning.Version("2.2.1")
+package org.apache.sling.jackrabbit.usermanager;
+
+
Propchange: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/package-info.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url