You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2016/06/27 18:15:47 UTC
[1/2] nutch git commit: fix for NUTCH-2282 contributed by lancergr
Repository: nutch
Updated Branches:
refs/heads/2.x a9b238fae -> 8438b0658
fix for NUTCH-2282 contributed by lancergr
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/98814a02
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/98814a02
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/98814a02
Branch: refs/heads/2.x
Commit: 98814a0270cfc173998366618171f746ec4d304b
Parents: 9a349a1
Author: lancergr <g....@outlook.com>
Authored: Sat Jun 18 18:01:31 2016 +0200
Committer: lancergr <g....@outlook.com>
Committed: Sat Jun 18 18:01:31 2016 +0200
----------------------------------------------------------------------
src/java/org/apache/nutch/api/resources/AdminResource.java | 3 +++
src/java/org/apache/nutch/api/resources/ConfigResource.java | 3 +++
src/java/org/apache/nutch/api/resources/JobResource.java | 2 ++
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/98814a02/src/java/org/apache/nutch/api/resources/AdminResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/resources/AdminResource.java b/src/java/org/apache/nutch/api/resources/AdminResource.java
index 0863b33..03ff4b5 100644
--- a/src/java/org/apache/nutch/api/resources/AdminResource.java
+++ b/src/java/org/apache/nutch/api/resources/AdminResource.java
@@ -23,6 +23,8 @@ import java.util.concurrent.TimeUnit;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
import org.apache.nutch.api.model.response.NutchStatus;
import org.apache.nutch.api.model.response.JobInfo.State;
@@ -52,6 +54,7 @@ public class AdminResource extends AbstractResource {
@GET
@Path("/stop")
+ @Produces(MediaType.TEXT_PLAIN)
public String stop(@QueryParam("force") boolean force) {
if (!server.canStop(force)) {
LOG.info("Command 'stop' denied due to unfinished jobs");
http://git-wip-us.apache.org/repos/asf/nutch/blob/98814a02/src/java/org/apache/nutch/api/resources/ConfigResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/resources/ConfigResource.java b/src/java/org/apache/nutch/api/resources/ConfigResource.java
index 9be0daa..0c546f6 100644
--- a/src/java/org/apache/nutch/api/resources/ConfigResource.java
+++ b/src/java/org/apache/nutch/api/resources/ConfigResource.java
@@ -20,6 +20,7 @@ import java.util.Map;
import java.util.Set;
import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
@@ -52,6 +53,7 @@ public class ConfigResource extends AbstractResource {
@GET
@Path("/{configId}/{propertyId}")
+ @Produces(MediaType.TEXT_PLAIN)
public String getProperty(@PathParam("configId") String configId,
@PathParam("propertyId") String propertyId) {
return configManager.getAsMap(configId).get(propertyId);
@@ -66,6 +68,7 @@ public class ConfigResource extends AbstractResource {
@POST
@Path("/{configId}")
@Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.TEXT_PLAIN)
public String createConfig(NutchConfig newConfig) {
if (newConfig == null) {
throw new WebApplicationException(Response.status(Status.BAD_REQUEST)
http://git-wip-us.apache.org/repos/asf/nutch/blob/98814a02/src/java/org/apache/nutch/api/resources/JobResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/api/resources/JobResource.java b/src/java/org/apache/nutch/api/resources/JobResource.java
index 30b14d8..cca5a3c 100644
--- a/src/java/org/apache/nutch/api/resources/JobResource.java
+++ b/src/java/org/apache/nutch/api/resources/JobResource.java
@@ -19,6 +19,7 @@ package org.apache.nutch.api.resources;
import java.util.Collection;
import javax.ws.rs.Consumes;
+import javax.ws.rs.Produces;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -63,6 +64,7 @@ public class JobResource extends AbstractResource {
@POST
@Path(value = "/create")
@Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.TEXT_PLAIN)
public String create(JobConfig config) {
if (config == null) {
throwBadRequestException("Job configuration is required!");
[2/2] nutch git commit: Merge branch 'NUTCH-2282' of
https://github.com/lancergr/nutch into 2.x this closes #120
Posted by le...@apache.org.
Merge branch 'NUTCH-2282' of https://github.com/lancergr/nutch into 2.x this closes #120
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/8438b065
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/8438b065
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/8438b065
Branch: refs/heads/2.x
Commit: 8438b065892c517901295d1128f68cd1a6236bcb
Parents: a9b238f 98814a0
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Mon Jun 27 11:21:47 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Mon Jun 27 11:21:47 2016 -0700
----------------------------------------------------------------------
src/java/org/apache/nutch/api/resources/AdminResource.java | 3 +++
src/java/org/apache/nutch/api/resources/ConfigResource.java | 3 +++
src/java/org/apache/nutch/api/resources/JobResource.java | 2 ++
3 files changed, 8 insertions(+)
----------------------------------------------------------------------