Author: bdelacretaz
Date: Mon Aug 2 16:08:34 2010
New Revision: 981576
URL: http://svn.apache.org/viewvc?rev=981576&view=rev
Log:
SLING-550 - JobStateChangeServlet added, POST to job node changes job state
Added:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
(with props)
Modified:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
Modified:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java?rev=981576&r1=981575&r2=981576&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
(original)
+++
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobInfoServlet.java
Mon Aug 2 16:08:34 2010
@@ -28,6 +28,7 @@ import javax.servlet.ServletException;
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.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -45,7 +46,10 @@ import org.apache.sling.commons.json.io.
*/
@Component
@Service
-...@property(name = "sling.servlet.resourceTypes", value =
BackgroundServletConstants.JOB_RESOURCE_TYPE)
+...@properties({
+ @Property(name = "sling.servlet.resourceTypes", value =
BackgroundServletConstants.JOB_RESOURCE_TYPE),
+ @Property(name = "sling.servlet.methods", value="GET")
+})
@SuppressWarnings("serial")
public class JobInfoServlet extends SlingSafeMethodsServlet {
Added:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java?rev=981576&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
(added)
+++
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
Mon Aug 2 16:08:34 2010
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package org.apache.sling.bgservlets.impl.servlets;
+
+import java.io.IOException;
+
+import javax.jcr.Session;
+import javax.servlet.ServletException;
+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.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+import org.apache.sling.bgservlets.BackgroundServletConstants;
+import org.apache.sling.bgservlets.JobConsole;
+import org.apache.sling.bgservlets.JobStatus;
+import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.commons.json.io.JSONWriter;
+
+/** Handles POST to a job node, to request a job
+ * state change.
+ */
+...@component
+...@service
+...@properties({
+ @Property(name = "sling.servlet.resourceTypes", value =
BackgroundServletConstants.JOB_RESOURCE_TYPE),
+ @Property(name = "sling.servlet.methods", value="POST")
+})
+...@suppresswarnings("serial")
+public class JobStateChangeServlet extends SlingAllMethodsServlet {
+
+ public static final String PARAM_STATE = "desiredState";
+
+ @Reference
+ private JobConsole jobConsole;
+
+ @Override
+ protected void doPost(SlingHttpServletRequest request,
SlingHttpServletResponse response)
+ throws ServletException, IOException {
+ final String str = request.getParameter(PARAM_STATE);
+ if(str == null) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Missing
parameter:" + PARAM_STATE);
+ }
+ JobStatus.State desiredState = JobStatus.State.NEW;
+ try {
+ desiredState = JobStatus.State.valueOf(str);
+ } catch(Exception e) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Invalid "
+ PARAM_STATE + ": " + str);
+ return;
+ }
+
+ final Session session =
request.getResourceResolver().adaptTo(Session.class);
+ if(session == null) {
+ response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
"ResourceResolver does not adapt to a Session");
+ return;
+ }
+ final JobStatus j = jobConsole.getJobStatus(session,
request.getResource().getPath());
+ j.requestStateChange(desiredState);
+
+ response.setContentType("application/json");
+ response.setCharacterEncoding("UTF-8");
+ final JSONWriter w = new JSONWriter(response.getWriter());
+ try {
+ w.object();
+ w.key("info").value("Requested state change");
+ w.key(PARAM_STATE).value(desiredState.toString());
+ w.key("path").value(j.getPath());
+ w.key("currentState").value(j.getState());
+ w.endObject();
+ } catch(JSONException je) {
+ throw new ServletException("JSONException in doPost", je);
+ }
+ }
+}
Propchange:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/contrib/extensions/bgservlets/src/main/java/org/apache/sling/bgservlets/impl/servlets/JobStateChangeServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
