Author: cgeer
Date: Fri Mar 22 21:23:55 2013
New Revision: 1459998
URL: http://svn.apache.org/r1459998
Log:
RAVE-910 - Added support for JSON. Web service will now respect the "Accepts"
http header for "application/xml" and "application/json" and return the correct
result.
Modified:
rave/trunk/pom.xml
rave/trunk/rave-portal-dependencies/pom.xml
rave/trunk/rave-portal-resources/pom.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1459998&r1=1459997&r2=1459998&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Fri Mar 22 21:23:55 2013
@@ -366,6 +366,11 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
Modified: rave/trunk/rave-portal-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-dependencies/pom.xml?rev=1459998&r1=1459997&r2=1459998&view=diff
==============================================================================
--- rave/trunk/rave-portal-dependencies/pom.xml (original)
+++ rave/trunk/rave-portal-dependencies/pom.xml Fri Mar 22 21:23:55 2013
@@ -147,6 +147,16 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
</dependency>
+ <!-- Jackson -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: rave/trunk/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/pom.xml?rev=1459998&r1=1459997&r2=1459998&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/pom.xml (original)
+++ rave/trunk/rave-portal-resources/pom.xml Fri Mar 22 21:23:55 2013
@@ -72,10 +72,6 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </dependency>
</dependencies>
<build>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml?rev=1459998&r1=1459997&r2=1459998&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/cxf-applicationContext.xml
Fri Mar 22 21:23:55 2013
@@ -15,6 +15,7 @@
<jaxrs:server id="rave" address="/rest">
<jaxrs:providers>
+ <bean class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider"/>
<bean class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
</jaxrs:providers>
<jaxrs:serviceBeans>
