You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:49:34 UTC
[sling-org-apache-sling-jcr-jackrabbit-usermanager] 15/33:
SLING-2644 - Make the jackrabbit/accessmanager and jackrabbit/usermanager
to work with newer servlets/post bundle
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git
commit 78c3704a24e0348e1ac06c332f271ef21e546715
Author: Mike Müller <my...@apache.org>
AuthorDate: Tue Dec 11 14:57:03 2012 +0000
SLING-2644 - Make the jackrabbit/accessmanager and jackrabbit/usermanager to work with newer servlets/post bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-usermanager@1420206 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 +-
.../usermanager/impl/post/AbstractPostServlet.java | 47 +++++++++++-----------
.../impl/post/ChangeUserPasswordServlet.java | 3 +-
.../usermanager/impl/post/CreateGroupServlet.java | 3 +-
.../usermanager/impl/post/CreateUserServlet.java | 3 +-
.../impl/post/DeleteAuthorizableServlet.java | 5 ++-
.../usermanager/impl/post/UpdateGroupServlet.java | 3 +-
.../usermanager/impl/post/UpdateUserServlet.java | 3 +-
8 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 816c0dc..866a590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.sling.jackrabbit.usermanager;version=2.2.0,
+ org.apache.sling.jackrabbit.usermanager;version=2.2.1,
</Export-Package>
<Private-Package>
org.apache.sling.jackrabbit.usermanager.impl.*
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
- <version>2.1.0</version>
+ <version>2.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
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 fec6cae..5057628 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
@@ -30,12 +30,13 @@ import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.servlets.HtmlResponse;
+import org.apache.sling.servlets.post.HtmlResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.api.wrappers.SlingRequestPaths;
+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.JSONResponse;
+import org.apache.sling.servlets.post.JSONResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,20 +65,20 @@ public abstract class AbstractPostServlet extends
SlingHttpServletResponse httpResponse) throws ServletException,
IOException {
// prepare the response
- HtmlResponse htmlResponse = createHtmlResponse(request);
- htmlResponse.setReferer(request.getHeader("referer"));
+ AbstractPostResponse response = createHtmlResponse(request);
+ response.setReferer(request.getHeader("referer"));
// calculate the paths
String path = getItemPath(request);
- htmlResponse.setPath(path);
+ response.setPath(path);
// location
- htmlResponse.setLocation(externalizePath(request, path));
+ response.setLocation(externalizePath(request, path));
// parent location
path = ResourceUtil.getParent(path);
if (path != null) {
- htmlResponse.setParentLocation(externalizePath(request, path));
+ response.setParentLocation(externalizePath(request, path));
}
Session session = request.getResourceResolver().adaptTo(Session.class);
@@ -85,7 +86,7 @@ public abstract class AbstractPostServlet extends
final List<Modification> changes = new ArrayList<Modification>();
try {
- handleOperation(request, htmlResponse, changes);
+ handleOperation(request, response, changes);
// TODO: maybe handle SlingAuthorizablePostProcessor handlers here
@@ -93,24 +94,24 @@ public abstract class AbstractPostServlet extends
for (Modification change : changes) {
switch (change.getType()) {
case MODIFY:
- htmlResponse.onModified(change.getSource());
+ response.onModified(change.getSource());
break;
case DELETE:
- htmlResponse.onDeleted(change.getSource());
+ response.onDeleted(change.getSource());
break;
case MOVE:
- htmlResponse.onMoved(change.getSource(),
+ response.onMoved(change.getSource(),
change.getDestination());
break;
case COPY:
- htmlResponse.onCopied(change.getSource(),
+ response.onCopied(change.getSource(),
change.getDestination());
break;
case CREATE:
- htmlResponse.onCreated(change.getSource());
+ response.onCreated(change.getSource());
break;
case ORDER:
- htmlResponse.onChange("ordered", change.getSource(),
+ response.onChange("ordered", change.getSource(),
change.getDestination());
break;
}
@@ -120,13 +121,13 @@ public abstract class AbstractPostServlet extends
session.save();
}
} catch (ResourceNotFoundException rnfe) {
- htmlResponse.setStatus(HttpServletResponse.SC_NOT_FOUND,
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND,
rnfe.getMessage());
} catch (Throwable throwable) {
log.debug("Exception while handling POST "
+ request.getResource().getPath() + " with "
+ getClass().getName(), throwable);
- htmlResponse.setError(throwable);
+ response.setError(throwable);
} finally {
try {
if (session.hasPendingChanges()) {
@@ -139,8 +140,8 @@ public abstract class AbstractPostServlet extends
}
// check for redirect URL if processing succeeded
- if (htmlResponse.isSuccessful()) {
- String redirect = getRedirectUrl(request, htmlResponse);
+ if (response.isSuccessful()) {
+ String redirect = getRedirectUrl(request, response);
if (redirect != null) {
httpResponse.sendRedirect(redirect);
return;
@@ -148,7 +149,7 @@ public abstract class AbstractPostServlet extends
}
// create a html response and send if unsuccessful or no redirect
- htmlResponse.send(httpResponse, isSetStatus(request));
+ response.send(httpResponse, isSetStatus(request));
}
/**
@@ -160,7 +161,7 @@ public abstract class AbstractPostServlet extends
* </ul>
* or a {@link org.apache.sling.api.servlets.HtmlResponse} otherwise
*/
- protected HtmlResponse createHtmlResponse(SlingHttpServletRequest req) {
+ protected AbstractPostResponse createHtmlResponse(SlingHttpServletRequest req) {
if (JSONResponse.RESPONSE_CONTENT_TYPE.equals(req.getResponseContentType())) {
return new JSONResponse();
} else {
@@ -172,11 +173,11 @@ public abstract class AbstractPostServlet extends
* Extending Servlet should implement this operation to do the work
*
* @param request the sling http request to process
- * @param htmlResponse the response
+ * @param response the response
* @param changes
*/
abstract protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse htmlResponse, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException;
/**
@@ -185,7 +186,7 @@ public abstract class AbstractPostServlet extends
* @param ctx the post processor
* @return the redirect location or <code>null</code>
*/
- protected String getRedirectUrl(HttpServletRequest request, HtmlResponse ctx) {
+ protected String getRedirectUrl(HttpServletRequest request, AbstractPostResponse ctx) {
// redirect param has priority (but see below, magic star)
String result = request.getParameter(SlingPostConstants.RP_REDIRECT_TO);
if (result != null && ctx.getPath() != null) {
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 1f18201..ec31e00 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
@@ -42,6 +42,7 @@ import org.apache.sling.commons.osgi.OsgiUtil;
import org.apache.sling.jackrabbit.usermanager.ChangeUserPassword;
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;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -150,7 +151,7 @@ public class ChangeUserPasswordServlet extends AbstractUserPostServlet implement
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse htmlResponse, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
Resource resource = request.getResource();
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 9ffe6b0..5b38101 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
@@ -40,6 +40,7 @@ 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;
@@ -112,7 +113,7 @@ public class CreateGroupServlet extends AbstractGroupPostServlet implements Crea
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse response, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
Session session = request.getResourceResolver().adaptTo(Session.class);
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 df280ed..77721fd 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
@@ -40,6 +40,7 @@ import org.apache.sling.jackrabbit.usermanager.CreateUser;
import org.apache.sling.jackrabbit.usermanager.impl.resource.AuthorizableResourceProvider;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.util.AccessControlUtil;
+import org.apache.sling.servlets.post.AbstractPostResponse;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.ModificationType;
import org.apache.sling.servlets.post.SlingPostConstants;
@@ -195,7 +196,7 @@ public class CreateUserServlet extends AbstractUserPostServlet implements Create
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse response, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
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 baac910..5d6637c 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
@@ -43,6 +43,7 @@ import org.apache.sling.jackrabbit.usermanager.DeleteGroup;
import org.apache.sling.jackrabbit.usermanager.DeleteUser;
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;
import org.apache.sling.servlets.post.SlingPostConstants;
@@ -114,7 +115,7 @@ public class DeleteAuthorizableServlet extends AbstractPostServlet
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse htmlResponse, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
Session session = request.getResourceResolver().adaptTo(Session.class);
@@ -130,7 +131,7 @@ public class DeleteAuthorizableServlet extends AbstractPostServlet
if (item == null) {
String msg = "Missing source " + resource.getPath()
+ " for delete";
- htmlResponse.setStatus(HttpServletResponse.SC_NOT_FOUND, msg);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND, msg);
throw new ResourceNotFoundException(msg);
} else {
if (item instanceof User) {
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 1b28d09..21128ec 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
@@ -40,6 +40,7 @@ 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;
@@ -113,7 +114,7 @@ public class UpdateGroupServlet extends AbstractGroupPostServlet
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse htmlResponse, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
Resource resource = request.getResource();
Session session = request.getResourceResolver().adaptTo(Session.class);
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 9e04782..f26eab0 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
@@ -37,6 +37,7 @@ import org.apache.sling.api.servlets.HtmlResponse;
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;
import org.apache.sling.servlets.post.impl.helper.RequestProperty;
@@ -106,7 +107,7 @@ public class UpdateUserServlet extends AbstractUserPostServlet
*/
@Override
protected void handleOperation(SlingHttpServletRequest request,
- HtmlResponse htmlResponse, List<Modification> changes)
+ AbstractPostResponse response, List<Modification> changes)
throws RepositoryException {
Resource resource = request.getResource();
Session session = request.getResourceResolver().adaptTo(Session.class);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.