This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.jcr.jackrabbit.usermanager-2.2.6
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git
commit 8404241df00c77ad59e322c24313d8ee1e53ba98
Author: Konrad Windszus <k...@apache.org>
AuthorDate: Fri Mar 31 09:05:14 2017 +0000
fix javadoc issues
to satisfy Java8 doclint
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-usermanager@1789638
13f79535-47bb-0310-9956-ffa450edef68
---
.../jackrabbit/usermanager/ChangeUserPassword.java | 2 +-
.../sling/jackrabbit/usermanager/CreateGroup.java | 2 +-
.../sling/jackrabbit/usermanager/CreateUser.java | 4 +--
.../usermanager/DeleteAuthorizables.java | 2 +-
.../sling/jackrabbit/usermanager/DeleteGroup.java | 2 +-
.../sling/jackrabbit/usermanager/DeleteUser.java | 2 +-
.../sling/jackrabbit/usermanager/UpdateGroup.java | 2 +-
.../sling/jackrabbit/usermanager/UpdateUser.java | 2 +-
.../impl/AuthorizablePrivilegesInfoImpl.java | 8 -----
.../impl/post/AbstractAuthorizablePostServlet.java | 35 +++++++++++-----------
.../impl/post/AbstractGroupPostServlet.java | 8 +++--
.../usermanager/impl/post/AbstractPostServlet.java | 12 +++++---
.../impl/post/ChangeUserPasswordServlet.java | 10 +++----
.../usermanager/impl/post/CreateGroupServlet.java | 10 +++----
.../usermanager/impl/post/CreateUserServlet.java | 15 ++++------
.../impl/post/DeleteAuthorizableServlet.java | 9 +++---
.../usermanager/impl/post/UpdateGroupServlet.java | 10 +++----
.../usermanager/impl/post/UpdateUserServlet.java | 14 ++++-----
18 files changed, 69 insertions(+), 80 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/ChangeUserPassword.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/ChangeUserPassword.java
index 9e9c39e..4c8dce5 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/ChangeUserPassword.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/ChangeUserPassword.java
@@ -47,7 +47,7 @@ public interface ChangeUserPassword {
* @param newPasswordConfirm The password value to apply again (required)
* @param changes The list of changes for this operation (optional)
* @return the user whose password was changed
- * @throws RepositoryException
+ * @throws RepositoryException if password can't be changed for some reason
*/
public User changePassword(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateGroup.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateGroup.java
index 11f0f3e..6899818 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateGroup.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateGroup.java
@@ -46,7 +46,7 @@ public interface CreateGroup {
* @param properties Extra properties to update on the group. The entry
values should be either a String or String[] (optional)
* @param changes The list of changes for this operation (optional)
* @return the group that was created
- * @throws RepositoryException
+ * @throws RepositoryException if group can't be created
*/
public Group createGroup(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateUser.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateUser.java
index fd5ab58..4da99fa 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateUser.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/CreateUser.java
@@ -44,11 +44,11 @@ public interface CreateUser {
* @param jcrSession the JCR session of the user creating the user
* @param name The name of the new user (required)
* @param password The password of the new user (required)
- * @param password The password of the new user again (required)
+ * @param passwordConfirm The password of the new user again (required)
* @param properties Extra properties to update on the user. The entry
values should be either a String or String[] (optional)
* @param changes The list of changes for this operation (optional)
* @return the user that was created
- * @throws RepositoryException
+ * @throws RepositoryException if user can't be created
*/
public User createUser(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteAuthorizables.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteAuthorizables.java
index 1230fcd..27923e3 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteAuthorizables.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteAuthorizables.java
@@ -44,7 +44,7 @@ public interface DeleteAuthorizables {
* @param baseResource the base resource to calculate the relative paths
from (required)
* @param paths An array of relative resource paths to Authorizables to be
deleted (required)
* @param changes The list of changes for this operation (optional)
- * @throws RepositoryException
+ * @throws RepositoryException if authorizable (user or group) can't be
deleted
*/
public void deleteAuthorizables(Session jcrSession,
Resource baseResource,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteGroup.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteGroup.java
index 318830c..297d66b 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteGroup.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteGroup.java
@@ -42,7 +42,7 @@ public interface DeleteGroup {
* @param jcrSession the JCR session of the user creating the user
* @param name The name of the group to delete (required)
* @param changes The list of changes for this operation (optional)
- * @throws RepositoryException
+ * @throws RepositoryException if group can't be deleted
*/
public void deleteGroup(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteUser.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteUser.java
index e159040..2d60690 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteUser.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/DeleteUser.java
@@ -42,7 +42,7 @@ public interface DeleteUser {
* @param jcrSession the JCR session of the user creating the user
* @param name The name of the user to delete (required)
* @param changes The list of changes for this operation (optional)
- * @throws RepositoryException
+ * @throws RepositoryException if user can't be deleted
*/
public void deleteUser(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateGroup.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateGroup.java
index caa57e5..faa30ae 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateGroup.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateGroup.java
@@ -46,7 +46,7 @@ public interface UpdateGroup {
* @param properties Extra properties to update on the group. The entry
values should be either a String or String[] (optional)
* @param changes The list of changes for this operation (optional)
* @return the group that was updated or null if not found
- * @throws RepositoryException
+ * @throws RepositoryException if group can't be updated
*/
public Group updateGroup(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateUser.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateUser.java
index e1395a6..65a6032 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateUser.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/UpdateUser.java
@@ -46,7 +46,7 @@ public interface UpdateUser {
* @param properties Extra properties to update on the user. The entry
values should be either a String or String[] (optional)
* @param changes The list of changes for this operation (optional)
* @return the user that was updated or null if not found
- * @throws RepositoryException
+ * @throws RepositoryException if user can't be updated
*/
public User updateUser(Session jcrSession,
String name,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
index de78b48..54486b8 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/AuthorizablePrivilegesInfoImpl.java
@@ -208,14 +208,6 @@ public class AuthorizablePrivilegesInfoImpl implements
AuthorizablePrivilegesInf
//keep track of the bundle context
private BundleContext bundleContext;
- /**
- * Called by SCR to activate the component.
- *
- * @throws InvalidKeyException
- * @throws NoSuchAlgorithmException
- * @throws IllegalStateException
- * @throws UnsupportedEncodingException
- */
@Activate
protected void activate(BundleContext bundleContext, Map<String, Object>
properties)
throws InvalidKeyException, NoSuchAlgorithmException,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
index e025422..02bdd4e 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
@@ -31,7 +31,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.Value;
import javax.jcr.ValueFactory;
-import javax.servlet.ServletException;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.sling.api.SlingIOException;
@@ -78,13 +77,11 @@ public abstract class AbstractAuthorizablePostServlet
extends
/**
* Collects the properties that form the content to be written back to the
* repository.
- *
- * @throws RepositoryException if a repository error occurs
- * @throws ServletException if an internal error occurs
+ * @param properties the properties out of which to generate the {@link
RequestProperty}s
+ * @return the list of {@link RequestProperty}s
*/
protected Collection<RequestProperty> collectContent(
- Map<String, ?> properties,
- String authorizablePath) {
+ Map<String, ?> properties) {
boolean requireItemPrefix = requireItemPathPrefix(properties);
@@ -275,9 +272,12 @@ public abstract class AbstractAuthorizablePostServlet
extends
/**
* Writes back the content
+ * @param session the sessioin to write the authorizable properties
+ * @param authorizable the authorizable to modify
+ * @param reqProperties the properties to write
+ * @param changes the list of changes which is supposed to be extended
*
* @throws RepositoryException if a repository error occurs
- * @throws ServletException if an internal error occurs
*/
protected void writeContent(Session session, Authorizable authorizable,
Collection<RequestProperty> reqProperties,
@@ -472,11 +472,11 @@ public abstract class AbstractAuthorizablePostServlet
extends
// ------ These methods were copied from AbstractSlingPostOperation ------
/**
- * Returns <code>true</code> if the <code>name</code> starts with either of
- * the prefixes {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT
- * <code>./</code>}, {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_PARENT
- * <code>../</code>} and {@link SlingPostConstants#ITEM_PREFIX_ABSOLUTE
- * <code>/</code>}.
+ * @param name the name
+ * @return <code>true</code> if the <code>name</code> starts with either of
+ * the prefixes {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT},
+ * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_PARENT} and
+ * {@link SlingPostConstants#ITEM_PREFIX_ABSOLUTE}
*/
protected boolean hasItemPathPrefix(String name) {
return name.startsWith(SlingPostConstants.ITEM_PREFIX_ABSOLUTE)
@@ -485,12 +485,13 @@ public abstract class AbstractAuthorizablePostServlet
extends
}
/**
- * Returns true if any of the request parameters starts with
- * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT <code>./</code>}.
+ * @param properties the request parameters
+ * @return {@code true} if any of the request parameters starts with
+ * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT}.
* In this case only parameters starting with either of the prefixes
- * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT <code>./</code>},
- * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_PARENT <code>../</code>}
- * and {@link SlingPostConstants#ITEM_PREFIX_ABSOLUTE <code>/</code>} are
+ * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_CURRENT},
+ * {@link SlingPostConstants#ITEM_PREFIX_RELATIVE_PARENT}
+ * and {@link SlingPostConstants#ITEM_PREFIX_ABSOLUTE} are
* considered as providing content to be stored. Otherwise all parameters
* not starting with the command prefix <code>:</code> are considered as
* parameters to be stored.
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractGroupPostServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractGroupPostServlet.java
index 8da122c..b12d8d5 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractGroupPostServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractGroupPostServlet.java
@@ -44,9 +44,11 @@ public abstract class AbstractGroupPostServlet extends
* the ":member" value ends with @Delete it is removed from the group
* membership, otherwise it is added to the group membership.
*
- * @param request
- * @param authorizable
- * @throws RepositoryException
+ * @param baseResource the group resource of the {@code authorizable}
+ * @param properties the request parameters
+ * @param authorizable the group to update
+ * @param changes the changes which are done by this operation (list is
extended)
+ * @throws RepositoryException when updating the membership failed
*/
protected void updateGroupMembership(Resource baseResource,
Map<String, ?> properties,
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
index 5057628..d1058ad 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
@@ -155,11 +155,11 @@ public abstract class AbstractPostServlet extends
/**
* Creates an instance of a HtmlResponse.
* @param req The request being serviced
- * @return a {@link
org.apache.sling.servlets.post.impl.helper.JSONResponse} if any of these
conditions are true:
+ * @return a {@link org.apache.sling.servlets.post.JSONResponse} if any of
these conditions are true:
* <ul>
* <li>the response content type is application/json
* </ul>
- * or a {@link org.apache.sling.api.servlets.HtmlResponse} otherwise
+ * or a {@link org.apache.sling.servlets.post.HtmlResponse} otherwise
*/
protected AbstractPostResponse createHtmlResponse(SlingHttpServletRequest
req) {
if
(JSONResponse.RESPONSE_CONTENT_TYPE.equals(req.getResponseContentType())) {
@@ -174,7 +174,8 @@ public abstract class AbstractPostServlet extends
*
* @param request the sling http request to process
* @param response the response
- * @param changes
+ * @param changes the changes to report
+ * @throws RepositoryException in case of exceptions during the operation
*/
abstract protected void handleOperation(SlingHttpServletRequest request,
AbstractPostResponse response, List<Modification> changes)
@@ -182,7 +183,7 @@ public abstract class AbstractPostServlet extends
/**
* compute redirect URL (SLING-126)
- *
+ * @param request the request
* @param ctx the post processor
* @return the redirect location or <code>null</code>
*/
@@ -261,6 +262,8 @@ public abstract class AbstractPostServlet extends
* <p>
* This method may be overwritten by extension if the operation has
* different requirements on path processing.
+ * @param request the current request
+ * @return the path of the resource
*/
protected String getItemPath(SlingHttpServletRequest request) {
return request.getResource().getPath();
@@ -270,6 +273,7 @@ public abstract class AbstractPostServlet extends
* Returns an external form of the given path prepending the context path
* and appending a display extension.
*
+ * @param request the request
* @param path the path to externalize
* @return the url
*/
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
index 3e24888..f2fd561 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
@@ -49,11 +49,11 @@ import org.slf4j.LoggerFactory;
* <code>/system/userManager/user/ieb</code>. This servlet responds at
* <code>/system/userManager/user/ieb.changePassword.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>oldPwd</dt>
* <dd>The current password for the user (required for non-administrators)</dd>
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
* <dt>newPwdConfirm</dt>
* <dd>The confirm new password for the user (required)</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success sent with no body</dd>
@@ -71,13 +71,13 @@ import org.slf4j.LoggerFactory;
* <dt>500</dt>
* <dd>Failure, including password validation errors. HTML explains the
failure.</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -FoldPwd=oldpassword -FnewPwd=newpassword -FnewPwdConfirm=newpassword
http://localhost:8080/system/userManager/user/ieb.changePassword.html
* </code>
*
- * <h4>Notes</h4>
+ * <h3>Notes</h3>
*/
@Component(service = {Servlet.class, ChangeUserPassword.class},
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
index c2c60dd..5ad9663 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
@@ -57,18 +57,18 @@ import org.osgi.service.component.annotations.Reference;
* <code>/system/userManager/group</code>. This servlet responds at
* <code>/system/userManager/group.create.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>:name</dt>
* <dd>The name of the new group (required)</dd>
* <dt>*</dt>
* <dd>Any additional parameters become properties of the group node
(optional)</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success, a redirect is sent to the group resource locator. The redirect
comes with
@@ -76,7 +76,7 @@ import org.osgi.service.component.annotations.Reference;
* <dt>500</dt>
* <dd>Failure, including group already exists. HTML explains the failure.</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -F:name=newGroupA -Fproperty1=value1
http://localhost:8080/system/userManager/group.create.html
@@ -177,7 +177,7 @@ public class CreateGroupServlet extends
AbstractGroupPostServlet implements Crea
String groupPath =
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PREFIX
+ group.getID();
- Collection<RequestProperty> reqProperties =
collectContent(properties, groupPath);
+ Collection<RequestProperty> reqProperties =
collectContent(properties);
changes.add(Modification.onCreated(groupPath));
// write content from form
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
index 76fd94b..64d43fa 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
@@ -59,11 +59,11 @@ import org.slf4j.LoggerFactory;
* <code>/rep:system/rep:userManager/rep:users</code> mapped to a resource url
* <code>/system/userManager/user</code>. This servlet responds at
<code>/system/userManager/user.create.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>:name</dt>
* <dd>The name of the new user (required)</dd>
@@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory;
* <dt>*</dt>
* <dd>Any additional parameters become properties of the user node
(optional)</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success, a redirect is sent to the users resource locator. The redirect
comes with
@@ -82,7 +82,7 @@ import org.slf4j.LoggerFactory;
* <dt>500</dt>
* <dd>Failure, including user already exists. HTML explains the failure.</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -F:name=ieb -Fpwd=password -FpwdConfirm=password -Fproperty1=value1
http://localhost:8080/system/userManager/user.create.html
@@ -151,11 +151,6 @@ public class CreateUserServlet extends
AbstractAuthorizablePostServlet implement
// ---------- SCR integration ---------------------------------------------
- /**
- * Activates this component.
- *
- * @param props The configuration properties
- */
@Activate
protected void activate(Config config, Map<String, Object> props) {
super.activate(props);
@@ -297,7 +292,7 @@ public class CreateUserServlet extends
AbstractAuthorizablePostServlet implement
String userPath =
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_USER_PREFIX
+ user.getID();
- Collection<RequestProperty> reqProperties =
collectContent(properties, userPath);
+ Collection<RequestProperty> reqProperties =
collectContent(properties);
changes.add(Modification.onCreated(userPath));
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
index b893610..7676b59 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
@@ -44,7 +44,6 @@ import org.apache.sling.servlets.post.SlingPostConstants;
import org.osgi.service.component.annotations.Component;
/**
-
* <h2>Rest Service Description</h2>
* <p>
* Deletes an Authorizable, currently a user or a group. Maps on to nodes of
resourceType <code>sling/users</code> or <code>sling/users</code> like
@@ -53,16 +52,16 @@ import org.osgi.service.component.annotations.Component;
* <code>/system/userManager/user.delete.html</code> or
<code>/system/userManager/group.delete.html</code>.
* The servlet also responds to single delete requests eg
<code>/system/userManager/group/newGroup.delete.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>:applyTo</dt>
* <dd>An array of relative resource references to Authorizables to be
deleted, if this parameter is present, the url is ignored and all the
Authorizables in the list are removed.</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success, no body.</dd>
@@ -71,7 +70,7 @@ import org.osgi.service.component.annotations.Component;
* <dt>500</dt>
* <dd>Failure</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -Fgo=1 http://localhost:8080/system/userManager/user/ieb.delete.html
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
index b1f4e4c..e1193d9 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
@@ -57,18 +57,18 @@ import org.osgi.service.component.annotations.Reference;
* <code>/system/userManager/group/testGroup</code>. This servlet responds at
* <code>/system/userManager/group/testGroup.update.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>*</dt>
* <dd>Any additional parameters become properties of the group node
(optional)</dd>
* <dt>*@Delete</dt>
* <dd>The property is deleted, eg prop1@Delete</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success, a redirect is sent to the group's resource locator. The
redirect comes with
@@ -78,7 +78,7 @@ import org.osgi.service.component.annotations.Reference;
* <dt>500</dt>
* <dd>Failure</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -Fprop1=value2 -Fproperty1=value1
http://localhost:8080/system/userManager/group/testGroup.update.html
@@ -157,7 +157,7 @@ public class UpdateGroupServlet extends
AbstractGroupPostServlet
String groupPath =
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PREFIX
+ group.getID();
- Collection<RequestProperty> reqProperties = collectContent(properties,
groupPath);
+ Collection<RequestProperty> reqProperties = collectContent(properties);
try {
// cleanup any old content (@Delete parameters)
processDeletes(group, reqProperties, changes);
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
index 139ebab..0eb4788 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateUserServlet.java
@@ -31,7 +31,6 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.jackrabbit.usermanager.UpdateUser;
-import
org.apache.sling.jackrabbit.usermanager.impl.resource.AuthorizableResourceProvider;
import org.apache.sling.jcr.base.util.AccessControlUtil;
import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
@@ -51,18 +50,18 @@ import org.osgi.service.component.annotations.Deactivate;
* <code>/system/userManager/user/ieb</code>. This servlet responds at
* <code>/system/userManager/user/ieb.update.html</code>
* </p>
- * <h4>Methods</h4>
+ * <h3>Methods</h3>
* <ul>
* <li>POST</li>
* </ul>
- * <h4>Post Parameters</h4>
+ * <h3>Post Parameters</h3>
* <dl>
* <dt>*</dt>
* <dd>Any additional parameters become properties of the user node
(optional)</dd>
* <dt>*@Delete</dt>
* <dd>Delete the property eg prop3@Delete means prop3 will be deleted
(optional)</dd>
* </dl>
- * <h4>Response</h4>
+ * <h3>Response</h3>
* <dl>
* <dt>200</dt>
* <dd>Success, a redirect is sent to the users resource locator. The redirect
comes with
@@ -72,7 +71,7 @@ import org.osgi.service.component.annotations.Deactivate;
* <dt>500</dt>
* <dd>Failure</dd>
* </dl>
- * <h4>Example</h4>
+ * <h3>Example</h3>
*
* <code>
* curl -Fprop1=value2 -Fproperty1=value1
http://localhost:8080/system/userManager/user/ieb.update.html
@@ -144,10 +143,7 @@ public class UpdateUserServlet extends
AbstractAuthorizablePostServlet
"User to update could not be determined");
}
- String userPath =
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PREFIX
- + user.getID();
-
- Collection<RequestProperty> reqProperties = collectContent(properties,
userPath);
+ Collection<RequestProperty> reqProperties = collectContent(properties);
try {
// cleanup any old content (@Delete parameters)
processDeletes(user, reqProperties, changes);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
