Author: cgeer
Date: Wed Jun 26 06:23:36 2013
New Revision: 1496775
URL: http://svn.apache.org/r1496775
Log:
RAVE-982
- Upgraded project to Jackson 2.1.5
Modified:
rave/trunk/pom.xml
rave/trunk/rave-components/rave-commons/pom.xml
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/JsonUtils.java
rave/trunk/rave-components/rave-core-api/pom.xml
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java
rave/trunk/rave-components/rave-core/pom.xml
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
rave/trunk/rave-components/rave-jpa/pom.xml
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
rave/trunk/rave-components/rave-mongodb/pom.xml
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbGroup.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
rave/trunk/rave-components/rave-web/pom.xml
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
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
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Modified: rave/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Wed Jun 26 06:23:36 2013
@@ -66,7 +66,7 @@
<org.openid4java.version>0.9.6</org.openid4java.version>
<jersey-server.version>1.16</jersey-server.version>
<jersey-spring.version>1.16</jersey-spring.version>
- <jackson.version>1.9.11</jackson.version>
+ <jackson.version>2.1.5</jackson.version>
<json.version>20090211</json.version>
<guice.version>3.0</guice.version>
<httpclient.version>4.2.2</httpclient.version>
@@ -351,23 +351,18 @@
<version>${org.springframework.data.mongodb.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-mrbean</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
Modified: rave/trunk/rave-components/rave-commons/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/pom.xml (original)
+++ rave/trunk/rave-components/rave-commons/pom.xml Wed Jun 26 06:23:36 2013
@@ -77,15 +77,10 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
+
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <scope>provided</scope>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-mrbean</artifactId>
</dependency>
<!-- Test -->
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/JsonUtils.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/JsonUtils.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/JsonUtils.java
(original)
+++
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/JsonUtils.java
Wed Jun 26 06:23:36 2013
@@ -19,12 +19,11 @@
package org.apache.rave.util;
-
-import org.codehaus.jackson.map.AnnotationIntrospector;
-import org.codehaus.jackson.map.DeserializationConfig;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.introspect.JacksonAnnotationIntrospector;
-import org.codehaus.jackson.mrbean.MrBeanModule;
+import com.fasterxml.jackson.databind.AnnotationIntrospector;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
+import com.fasterxml.jackson.module.mrbean.MrBeanModule;
import org.springframework.core.io.Resource;
import java.io.IOException;
@@ -61,7 +60,7 @@ public class JsonUtils {
ObjectMapper jacksonMapper = new ObjectMapper();
AnnotationIntrospector primary = new JacksonAnnotationIntrospector();
jacksonMapper.setAnnotationIntrospector(primary);
-
jacksonMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
+
jacksonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
jacksonMapper.registerModule(new MrBeanModule());
return jacksonMapper;
}
Modified: rave/trunk/rave-components/rave-core-api/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core-api/pom.xml (original)
+++ rave/trunk/rave-components/rave-core-api/pom.xml Wed Jun 26 06:23:36 2013
@@ -40,8 +40,8 @@
<artifactId>spring-security-core</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<!-- TEST -->
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/model/RegionWidget.java
Wed Jun 26 06:23:36 2013
@@ -19,7 +19,7 @@
package org.apache.rave.model;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import javax.xml.bind.annotation.XmlTransient;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/pom.xml (original)
+++ rave/trunk/rave-components/rave-core/pom.xml Wed Jun 26 06:23:36 2013
@@ -93,18 +93,6 @@
<artifactId>spring-oxm</artifactId>
</dependency>
- <!-- Jackson JSON Mapper -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- JSON Support -->
<dependency>
<groupId>org.json</groupId>
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
Wed Jun 26 06:23:36 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.model.Page;
import org.apache.rave.model.PageInvitationStatus;
import org.apache.rave.model.PageUser;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
public class PageUserImpl implements PageUser {
private String id;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
Wed Jun 26 06:23:36 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.model.Page;
import org.apache.rave.model.Region;
import org.apache.rave.model.RegionWidget;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import java.util.List;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
Wed Jun 26 06:23:36 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rave.portal.model.impl;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import org.apache.rave.model.Region;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.model.RegionWidgetPreference;
-import org.codehaus.jackson.annotate.JsonBackReference;
import java.util.List;
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceSearchResult.java
Wed Jun 26 06:23:36 2013
@@ -21,10 +21,10 @@ package org.apache.rave.portal.model.uti
import java.util.ArrayList;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.ExternalWidgetImpl;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
/**
* Wrapper for a set of search results from an external marketplace,
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/WidgetMarketplaceWidgetResult.java
Wed Jun 26 06:23:36 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rave.portal.model.util;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.ExternalWidgetImpl;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
@JsonIgnoreProperties(ignoreUnknown = true)
public class WidgetMarketplaceWidgetResult {
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
Wed Jun 26 06:23:36 2013
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
-import
org.springframework.http.converter.json.MappingJacksonHttpMessageConverter;
+import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestClientException;
import org.springframework.web.client.RestTemplate;
@@ -161,7 +161,7 @@ public class DefaultWidgetMarketplaceSer
RestTemplate restTemplate = new RestTemplate();
List<HttpMessageConverter<?>> mc = restTemplate.getMessageConverters();
// Add JSON message handler
- MappingJacksonHttpMessageConverter json = new
MappingJacksonHttpMessageConverter();
+ MappingJackson2HttpMessageConverter json = new
MappingJackson2HttpMessageConverter();
List<MediaType> supportedMediaTypes = new ArrayList<MediaType>();
supportedMediaTypes.add(new MediaType("application","json",
Charset.forName("UTF-8")));
// Add default media type in case marketplace uses incorrect MIME
type, otherwise
Modified: rave/trunk/rave-components/rave-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/pom.xml (original)
+++ rave/trunk/rave-components/rave-jpa/pom.xml Wed Jun 26 06:23:36 2013
@@ -70,16 +70,6 @@
<artifactId>spring-security-web</artifactId>
</dependency>
- <!-- Jackson JSON Mapper -->
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </dependency>
-
<!-- JSON Support -->
<dependency>
<groupId>org.json</groupId>
@@ -156,6 +146,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>${org.hamcrest.version}</version>
+ </dependency>
</dependencies>
<build>
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
Wed Jun 26 06:23:36 2013
@@ -15,11 +15,11 @@
*/
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.rave.model.Category;
import org.apache.rave.model.User;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
-import org.codehaus.jackson.annotate.JsonIgnore;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlRootElement;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
Wed Jun 26 06:23:36 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
import org.apache.rave.model.*;
import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.codehaus.jackson.annotate.JsonManagedReference;
import javax.persistence.*;
import javax.xml.bind.annotation.*;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
Wed Jun 26 06:23:36 2013
@@ -27,7 +27,7 @@ import org.apache.rave.model.PageInvitat
import org.apache.rave.model.PageUser;
import org.apache.rave.model.User;
import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
@Entity
@Access(AccessType.FIELD)
@Table(name = "page_user",
uniqueConstraints={@UniqueConstraint(columnNames={"page_id","user_id"})})
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
Wed Jun 26 06:23:36 2013
@@ -18,13 +18,13 @@
*/
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
import org.apache.rave.model.Page;
import org.apache.rave.model.Region;
import org.apache.rave.model.RegionWidget;
import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.codehaus.jackson.annotate.JsonBackReference;
-import org.codehaus.jackson.annotate.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import javax.persistence.*;
import javax.xml.bind.annotation.XmlAccessType;
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
Wed Jun 26 06:23:36 2013
@@ -23,7 +23,7 @@ import org.apache.rave.model.RegionWidge
import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.conversion.ConvertingListProxyFactory;
import org.apache.rave.portal.model.conversion.JpaConverter;
-import org.codehaus.jackson.annotate.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonBackReference;
import javax.persistence.*;
import java.io.Serializable;
Modified: rave/trunk/rave-components/rave-mongodb/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/pom.xml (original)
+++ rave/trunk/rave-components/rave-mongodb/pom.xml Wed Jun 26 06:23:36 2013
@@ -81,16 +81,6 @@
<!-- Jackson JSON Mapper -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<scope>provided</scope>
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
Wed Jun 26 06:23:36 2013
@@ -19,12 +19,11 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
import org.apache.rave.portal.repository.MongoWidgetOperations;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -35,7 +34,7 @@ import static org.springframework.data.m
import static org.springframework.data.mongodb.core.query.Query.query;
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbCategory extends CategoryImpl {
@XmlTransient @JsonIgnore
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbGroup.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbGroup.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbGroup.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbGroup.java
Wed Jun 26 06:23:36 2013
@@ -19,14 +19,13 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
import org.apache.rave.portal.model.impl.GroupImpl;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbGroup extends GroupImpl {
}
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
Wed Jun 26 06:23:36 2013
@@ -19,16 +19,15 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
import org.apache.rave.model.Page;
import org.apache.rave.portal.model.impl.PageImpl;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbPage extends PageImpl {
private String pageLayoutCode;
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
Wed Jun 26 06:23:36 2013
@@ -20,19 +20,18 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import org.apache.rave.model.PageLayout;
import org.apache.rave.portal.model.impl.PageTemplateImpl;
import org.apache.rave.portal.repository.PageLayoutRepository;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlTransient;
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbPageTemplate extends PageTemplateImpl {
@XmlTransient @JsonIgnore
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
Wed Jun 26 06:23:36 2013
@@ -19,14 +19,13 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.collect.Lists;
import org.apache.rave.model.Authority;
import org.apache.rave.model.PageLayout;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.PageLayoutRepository;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonMethod;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -39,7 +38,7 @@ import java.util.List;
/**
*/
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbUser extends UserImpl {
private List<String> authorityCodes;
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
(original)
+++
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
Wed Jun 26 06:23:36 2013
@@ -19,14 +19,13 @@
package org.apache.rave.portal.model;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.google.common.collect.Lists;
import org.apache.rave.model.Category;
import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.repository.CategoryRepository;
-import org.codehaus.jackson.annotate.JsonAutoDetect;
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonMethod;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -37,7 +36,7 @@ import java.util.List;
*/
@XmlAccessorType(value = XmlAccessType.FIELD)
-@JsonAutoDetect(value = JsonMethod.FIELD, fieldVisibility =
JsonAutoDetect.Visibility.ANY)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
public class MongoDbWidget extends WidgetImpl {
@XmlTransient @JsonIgnore
Modified: rave/trunk/rave-components/rave-web/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/pom.xml (original)
+++ rave/trunk/rave-components/rave-web/pom.xml Wed Jun 26 06:23:36 2013
@@ -53,10 +53,6 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mrbean</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
Wed Jun 26 06:23:36 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.web.model;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.mrbean.MrBeanModule;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.module.mrbean.MrBeanModule;
import org.springframework.beans.factory.FactoryBean;
/**
Modified: rave/trunk/rave-portal-dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-dependencies/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-portal-dependencies/pom.xml (original)
+++ rave/trunk/rave-portal-dependencies/pom.xml Wed Jun 26 06:23:36 2013
@@ -149,12 +149,8 @@
<!-- Jackson -->
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
</dependency>
</dependencies>
Modified: rave/trunk/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/pom.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/pom.xml (original)
+++ rave/trunk/rave-portal-resources/pom.xml Wed Jun 26 06:23:36 2013
@@ -72,6 +72,11 @@
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <scope>provided</scope>
+ </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=1496775&r1=1496774&r2=1496775&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
Wed Jun 26 06:23:36 2013
@@ -34,7 +34,7 @@
<jaxrs:server id="rave" address="/rest">
<jaxrs:providers>
- <bean class="org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider"/>
+ <bean
class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
<bean class="org.apache.cxf.jaxrs.provider.JAXBElementProvider"/>
</jaxrs:providers>
<jaxrs:serviceBeans>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1496775&r1=1496774&r2=1496775&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
Wed Jun 26 06:23:36 2013
@@ -58,7 +58,7 @@
</list>
</property>
</bean>
- <bean
class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter">
+ <bean
class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
<property name="objectMapper">
<bean
class="org.apache.rave.portal.web.model.MaterializedBeanObjectMapperFactory"/>
</property>
