You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/01/08 09:00:29 UTC
svn commit: r897126 - in /camel/trunk/components/camel-web: ./
src/main/java/org/apache/camel/web/resources/
src/main/resources/META-INF/services/
Author: davsclaus
Date: Fri Jan 8 08:00:28 2010
New Revision: 897126
URL: http://svn.apache.org/viewvc?rev=897126&view=rev
Log:
CAMEL-2341: Reverted rev 891737 which caused the code not to compile on some platforms (eg. RH Linux etc.).
Removed:
camel/trunk/components/camel-web/src/main/resources/META-INF/services/
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=897126&r1=897125&r2=897126&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Fri Jan 8 08:00:28 2010
@@ -91,9 +91,9 @@
<version>${jersey-version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>1.3.2</version>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>${jersey-version}</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=897126&r1=897125&r2=897126&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 Fri Jan 8 08:00:28 2010
@@ -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, "text/json"})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_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=897126&r1=897125&r2=897126&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 Fri Jan 8 08:00:28 2010
@@ -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,text/json";
+ public static final String DATA_MIME_TYPES = "text/xml,application/xml,application/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=897126&r1=897125&r2=897126&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 Fri Jan 8 08:00:28 2010
@@ -53,7 +53,7 @@
* Returns a list of endpoints available in this context
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, "text/json"})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_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=897126&r1=897125&r2=897126&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 Fri Jan 8 08:00:28 2010
@@ -86,7 +86,7 @@
* Returns the XML or JSON representation of this route
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, "text/json"})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public RouteDefinition getRoute() {
return route;
}
@@ -142,7 +142,7 @@
*/
@POST
@Consumes()
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, "text/json"})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_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=897126&r1=897125&r2=897126&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 Fri Jan 8 08:00:28 2010
@@ -69,7 +69,7 @@
* Returns the routes currently active within this context
*/
@GET
- @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, "text/json"})
+ @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
public RoutesDefinition getRouteDefinitions() {
RoutesDefinition answer = new RoutesDefinition();
CamelContext camelContext = getCamelContext();