Author: jstrachan
Date: Thu Dec 17 14:50:48 2009
New Revision: 891737
URL: http://svn.apache.org/viewvc?rev=891737&view=rev
Log:
fix for CAMEL-2301 to switch to jackson for JSON marshalling
Added:
camel/trunk/components/camel-web/src/main/resources/META-INF/services/
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
Modified:
camel/trunk/components/camel-web/pom.xml
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
Modified: camel/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Thu Dec 17 14:50:48 2009
@@ -91,9 +91,9 @@
<version>${jersey-version}</version>
</dependency>
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey-version}</version>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>1.3.2</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/CamelContextResource.java
Thu Dec 17 14:50:48 2009
@@ -95,7 +95,7 @@
@GET
// TODO we can replace this long expression with a static constant
// when Jersey supports JAX-RS 1.1
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON, "text/json"})
public Camel getCamel() {
return new Camel(camelContext, getVersion());
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/Constants.java
Thu Dec 17 14:50:48 2009
@@ -23,7 +23,7 @@
public static final String HTML_MIME_TYPES = "text/html;qs=5";
- public static final String DATA_MIME_TYPES =
"text/xml,application/xml,application/json";
+ public static final String DATA_MIME_TYPES =
"text/xml,application/xml,application/json,text/json";
public static final String DOT_MIMETYPE = "text/vnd.graphviz";
public static final String JAXB_PACKAGES =
org.apache.camel.model.Constants.JAXB_CONTEXT_PACKAGES +
":org.apache.camel.web.model";
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/EndpointsResource.java
Thu Dec 17 14:50:48 2009
@@ -53,7 +53,7 @@
* Returns a list of endpoints available in this context
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON, "text/json"})
public Endpoints getDTO() {
return new Endpoints(getCamelContext());
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
Thu Dec 17 14:50:48 2009
@@ -86,7 +86,7 @@
* Returns the XML or JSON representation of this route
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON, "text/json"})
public RouteDefinition getRoute() {
return route;
}
@@ -142,7 +142,7 @@
*/
@POST
@Consumes()
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON, "text/json"})
public void postRoute(RouteDefinition routeDefinition) throws Exception {
// lets preserve the ID
routeDefinition.setId(id);
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java?rev=891737&r1=891736&r2=891737&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RoutesResource.java
Thu Dec 17 14:50:48 2009
@@ -69,7 +69,7 @@
* Returns the routes currently active within this context
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML,
MediaType.APPLICATION_JSON, "text/json"})
public RoutesDefinition getRouteDefinitions() {
RoutesDefinition answer = new RoutesDefinition();
CamelContext camelContext = getCamelContext();
Added:
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader?rev=891737&view=auto
==============================================================================
---
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
(added)
+++
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyReader
Thu Dec 17 14:50:48 2009
@@ -0,0 +1 @@
+org.codehaus.jackson.jaxrs.JacksonJsonProvider
\ No newline at end of file
Added:
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter?rev=891737&view=auto
==============================================================================
---
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
(added)
+++
camel/trunk/components/camel-web/src/main/resources/META-INF/services/javax.ws.rs.ext.MessageBodyWriter
Thu Dec 17 14:50:48 2009
@@ -0,0 +1 @@
+org.codehaus.jackson.jaxrs.JacksonJsonProvider
\ No newline at end of file
