svn commit: r1399002 - /rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/

Tue, 16 Oct 2012 14:45:00 -0700 

Author: mfranklin
Date: Tue Oct 16 21:44:09 2012
New Revision: 1399002

URL: http://svn.apache.org/viewvc?rev=1399002&view=rev
Log:
Added transient markers for non-serializable properties

Modified:
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageUser.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbRegionWidget.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetComment.java
    
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
 Tue Oct 16 21:44:09 2012
@@ -22,10 +22,19 @@ package org.apache.rave.portal.model;
 import org.apache.rave.portal.model.impl.PageImpl;
 import org.apache.rave.portal.repository.PageLayoutRepository;
 import org.apache.rave.portal.repository.UserRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+
+@XmlAccessorType(value = XmlAccessType.FIELD)
 public class MongoDbPage extends PageImpl {
 
+    @XmlTransient @JsonIgnore
     private UserRepository userRepository;
+
+    @XmlTransient @JsonIgnore
     private PageLayoutRepository pageLayoutRepository;
 
     private Long ownerId;

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplateWidget.java
 Tue Oct 16 21:44:09 2012
@@ -21,9 +21,15 @@ package org.apache.rave.portal.model;
 
 import org.apache.rave.portal.model.impl.PageTemplateWidgetImpl;
 import org.apache.rave.portal.repository.WidgetRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
-public class MongoDbPageTemplateWidget extends PageTemplateWidgetImpl{
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
 
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbPageTemplateWidget extends PageTemplateWidgetImpl{
+    @XmlTransient @JsonIgnore
     private WidgetRepository widgetRepository;
     private Long widgetId;
 

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageUser.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageUser.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageUser.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageUser.java
 Tue Oct 16 21:44:09 2012
@@ -21,9 +21,16 @@ package org.apache.rave.portal.model;
 
 import org.apache.rave.portal.model.impl.PageUserImpl;
 import org.apache.rave.portal.repository.UserRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
 
-public class MongoDbPageUser extends PageUserImpl {
 
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbPageUser extends PageUserImpl {
+    @XmlTransient @JsonIgnore
     private UserRepository userRepository;
 
     private Long userId;

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbRegionWidget.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbRegionWidget.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbRegionWidget.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbRegionWidget.java
 Tue Oct 16 21:44:09 2012
@@ -22,9 +22,18 @@ package org.apache.rave.portal.model;
 
 import org.apache.rave.portal.model.impl.RegionWidgetImpl;
 import org.apache.rave.portal.repository.WidgetRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
+
+
+@XmlAccessorType(value = XmlAccessType.FIELD)
 public class MongoDbRegionWidget extends RegionWidgetImpl {
     private long widgetId;
+
+    @XmlTransient @JsonIgnore
     private WidgetRepository widgetRepository;
 
     public long getWidgetId() {

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
 Tue Oct 16 21:44:09 2012
@@ -23,14 +23,22 @@ import com.google.common.collect.Lists;
 import org.apache.rave.portal.model.impl.WidgetImpl;
 import org.apache.rave.portal.repository.CategoryRepository;
 import org.apache.rave.portal.repository.UserRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
 import java.util.List;
 
 /**
  */
-public class MongoDbWidget extends WidgetImpl {
 
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbWidget extends WidgetImpl {
+    @XmlTransient @JsonIgnore
     private CategoryRepository categoryRepository;
+
+    @XmlTransient @JsonIgnore
     private UserRepository userRepository;
 
     private Long ownerId;

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetComment.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetComment.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetComment.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetComment.java
 Tue Oct 16 21:44:09 2012
@@ -21,11 +21,18 @@ package org.apache.rave.portal.model;
 
 import org.apache.rave.portal.model.impl.WidgetCommentImpl;
 import org.apache.rave.portal.repository.UserRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
 
 /**
  */
-public class MongoDbWidgetComment extends WidgetCommentImpl {
 
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbWidgetComment extends WidgetCommentImpl {
+    @XmlTransient @JsonIgnore
     private UserRepository userRepository;
 
     private Long userId;

Modified: 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
URL: 
http://svn.apache.org/viewvc/rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java?rev=1399002&r1=1399001&r2=1399002&view=diff
==============================================================================
--- 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
 (original)
+++ 
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidgetTag.java
 Tue Oct 16 21:44:09 2012
@@ -21,11 +21,18 @@ package org.apache.rave.portal.model;
 
 import org.apache.rave.portal.model.impl.WidgetTagImpl;
 import org.apache.rave.portal.repository.UserRepository;
+import org.codehaus.jackson.annotate.JsonIgnore;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlTransient;
 
 /**
  */
-public class MongoDbWidgetTag extends WidgetTagImpl {
 
+@XmlAccessorType(value = XmlAccessType.FIELD)
+public class MongoDbWidgetTag extends WidgetTagImpl {
+    @XmlTransient @JsonIgnore
     private UserRepository userRepository;
 
     private Long userId;

Reply via email to