Author: mattmann
Date: Sun Mar 29 05:27:11 2015
New Revision: 1669855
URL: http://svn.apache.org/r1669855
Log:
- NUTCH-1970 Pretty print JSON output in config resouce contributed by Tyler
Palsulich and mattmann
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/ivy/ivy.xml
nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java
nutch/trunk/src/java/org/apache/nutch/service/resources/ConfigResource.java
nutch/trunk/src/java/org/apache/nutch/service/resources/JobResource.java
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1669855&r1=1669854&r2=1669855&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Sun Mar 29 05:27:11 2015
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development 1.10-SNAPSHOT
+* NUTCH-1970 Pretty print JSON output in config resource (Tyler Pasulich,
mattmann)
+
* NUTCH-1976 Allow Users to Set Hostname for Server (Tyler Palsulich via
mattmann)
* NUTCH-1941 Optional rolling http.agent.name's (Asitang Mishra, lewismc via
snagel)
Modified: nutch/trunk/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=1669855&r1=1669854&r2=1669855&view=diff
==============================================================================
--- nutch/trunk/ivy/ivy.xml (original)
+++ nutch/trunk/ivy/ivy.xml Sun Mar 29 05:27:11 2015
@@ -71,14 +71,15 @@
<dependency org="com.google.guava" name="guava" rev="11.0.2" />
<dependency org="com.google.code.crawler-commons"
name="crawler-commons"
rev="0.5" />
- <dependency org="org.apache.cxf" name="cxf" rev="3.0.4"/>
- <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws"
rev="3.0.4"/>
- <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs"
rev="3.0.4"/>
- <dependency org="org.apache.cxf" name="cxf-rt-transports-http"
rev="3.0.4"/>
- <dependency org="org.apache.cxf" name="cxf-rt-transports-http-jetty"
rev="3.0.4"/>
+ <dependency org="org.apache.cxf" name="cxf" rev="3.0.4"/>
+ <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws"
rev="3.0.4"/>
+ <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs"
rev="3.0.4"/>
+ <dependency org="org.apache.cxf" name="cxf-rt-transports-http"
rev="3.0.4"/>
+ <dependency org="org.apache.cxf"
name="cxf-rt-transports-http-jetty" rev="3.0.4"/>
<dependency org="com.fasterxml.jackson.core"
name="jackson-databind" rev="2.5.1" />
<dependency org="com.fasterxml.jackson.dataformat"
name="jackson-dataformat-cbor" rev="2.5.1" />
-
+ <dependency org="com.fasterxml.jackson.jaxrs"
name="jackson-jaxrs-json-provider" rev="2.5.1" />
+
<!--Configuration: test -->
<!--artifacts needed for testing -->
Modified: nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java?rev=1669855&r1=1669854&r2=1669855&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/service/NutchServer.java Sun Mar 29
05:27:11 2015
@@ -21,6 +21,7 @@ package org.apache.nutch.service;
import java.util.ArrayList;
import java.util.List;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.OptionBuilder;
@@ -36,7 +37,6 @@ import org.apache.cxf.jaxrs.lifecycle.Si
import org.apache.nutch.service.impl.ConfManagerImpl;
import org.apache.nutch.service.resources.ConfigResource;
import org.apache.nutch.service.resources.JobResource;
-import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
nutch/trunk/src/java/org/apache/nutch/service/resources/ConfigResource.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/service/resources/ConfigResource.java?rev=1669855&r1=1669854&r2=1669855&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/service/resources/ConfigResource.java
(original)
+++ nutch/trunk/src/java/org/apache/nutch/service/resources/ConfigResource.java
Sun Mar 29 05:27:11 2015
@@ -28,13 +28,13 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.GenericEntity;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.nutch.service.model.request.NutchConfig;
-import org.codehaus.jettison.json.JSONObject;
+import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
+import com.fasterxml.jackson.databind.SerializationFeature;
@Path("/config")
public class ConfigResource extends AbstractResource{
@@ -43,18 +43,21 @@ public class ConfigResource extends Abst
@GET
@Path("/")
+ @JacksonFeatures(serializationEnable = {
SerializationFeature.INDENT_OUTPUT })
public Set<String> getConfigs() {
return configManager.list();
}
@GET
@Path("/{configId}")
+ @JacksonFeatures(serializationEnable = {
SerializationFeature.INDENT_OUTPUT })
public Map<String, String> getConfig(@PathParam("configId") String
configId) {
return configManager.getAsMap(configId);
}
@GET
@Path("/{configId}/{propertyId}")
+ @JacksonFeatures(serializationEnable = {
SerializationFeature.INDENT_OUTPUT })
public String getProperty(@PathParam("configId") String configId,
@PathParam("propertyId") String propertyId) {
return configManager.getAsMap(configId).get(propertyId);
Modified:
nutch/trunk/src/java/org/apache/nutch/service/resources/JobResource.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/service/resources/JobResource.java?rev=1669855&r1=1669854&r2=1669855&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/service/resources/JobResource.java
(original)
+++ nutch/trunk/src/java/org/apache/nutch/service/resources/JobResource.java
Sun Mar 29 05:27:11 2015
@@ -26,6 +26,8 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.jaxrs.annotation.JacksonFeatures;
import org.apache.nutch.service.model.response.JobConfig;
import org.apache.nutch.service.model.response.JobInfo;
import org.apache.nutch.service.model.response.JobInfo.State;
@@ -35,12 +37,14 @@ public class JobResource extends Abstrac
@GET
@Path(value = "/")
+ @JacksonFeatures(serializationEnable = { SerializationFeature.INDENT_OUTPUT
})
public Collection<JobInfo> getJobs(@QueryParam("crawlId") String crawlId) {
return jobManager.list(crawlId, State.ANY);
}
@GET
@Path(value = "/{id}")
+ @JacksonFeatures(serializationEnable = { SerializationFeature.INDENT_OUTPUT
})
public JobInfo getInfo(@PathParam("id") String id,
@QueryParam("crawlId") String crawlId) {
return jobManager.get(crawlId, id);
