svn commit: r1452547 - in /rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal: model/JpaPageUser.java repository/impl/JpaPageRepository.java

[mfranklin]

Author: mfranklin
Date: Mon Mar  4 21:46:26 2013
New Revision: 1452547

URL: http://svn.apache.org/r1452547
Log:
Fixed issue with JpaUser conversion RAVE-908

Modified:
    
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/repository/impl/JpaPageRepository.java

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=1452547&r1=1452546&r2=1452547&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
 Mon Mar  4 21:46:26 2013
@@ -71,7 +71,7 @@ public class JpaPageUser implements Basi
         setPage(page);
     }
 
-    public JpaPageUser(JpaUser user, Page page, long sequence){
+    public JpaPageUser(User user, Page page, long sequence){
         this.userId = user.getId();
         setPage(page);
         this.renderSequence = sequence;

Modified: 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1452547&r1=1452546&r2=1452547&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
 (original)
+++ 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
 Mon Mar  4 21:46:26 2013
@@ -20,7 +20,6 @@
 package org.apache.rave.portal.repository.impl;
 
 import org.apache.rave.portal.model.*;
-import org.apache.rave.portal.model.conversion.JpaConverter;
 import org.apache.rave.portal.model.conversion.JpaPageConverter;
 import org.apache.rave.portal.repository.PageRepository;
 import org.apache.rave.util.CollectionUtils;
@@ -153,12 +152,11 @@ public class JpaPageRepository implement
      * @return Page
      */
     private Page convert(PageTemplate pt, User user) {
-        JpaUser jpaUser = JpaConverter.getInstance().convert(user, User.class);
         Page p = new JpaPage();
         p.setName(pt.getName());
         p.setPageType(pt.getPageType());
-        p.setOwnerId(jpaUser.getId());
-        PageUser pageUser = new JpaPageUser(jpaUser, p, 
pt.getRenderSequence());
+        p.setOwnerId(user.getId());
+        PageUser pageUser = new JpaPageUser(user, p, pt.getRenderSequence());
         pageUser.setPageStatus(PageInvitationStatus.OWNER);
         pageUser.setEditor(true);
         List<PageUser> members = new ArrayList<PageUser>();