rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1149428 - in /incubator/rave/trunk: rave-commons/src/main/java/org/apache/rave/orm/jpa/ rave-commons/src/main/java/org/apache/rave/persistence/ rave-commons/src/main/java/org/apache/rave/persistence/jpa/ rave-commons/src/main/java/org/apac...
Date Fri, 22 Jul 2011 01:14:59 GMT
Author: mfranklin
Date: Fri Jul 22 01:14:55 2011
New Revision: 1149428

URL: http://svn.apache.org/viewvc?rev=1149428&view=rev
Log:
Moved common JPA pattern to commons (Supports RAVE-62)

Added:
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/BasicEntity.java
      - copied, changed from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/BasicEntity.java
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java
      - copied, changed from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/
      - copied from r1149421, incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/orm/jpa/
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java
      - copied, changed from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/AbstractJpaRepository.java
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/
      - copied from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/
    incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/
    incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/
      - copied from r1149420, incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/impl/util/
Removed:
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/orm/jpa/
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/BasicEntity.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/AbstractJpaRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/util/
    incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/impl/util/
Modified:
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
    incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java
    incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/JpaUtilTest.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Page.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/PageLayout.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Region.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidget.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/User.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Widget.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/UserRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
    incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml
    incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java

Copied: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/BasicEntity.java
(from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/BasicEntity.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/BasicEntity.java?p2=incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/BasicEntity.java&p1=incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/BasicEntity.java&r1=1149420&r2=1149428&rev=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/BasicEntity.java
(original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/BasicEntity.java
Fri Jul 22 01:14:55 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.model;
+package org.apache.rave.persistence;
 
 /**
  * Defines common properties implemented by Entities in the model

Copied: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java
(from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java?p2=incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java&p1=incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java&r1=1149420&r2=1149428&rev=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/Repository.java
(original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java
Fri Jul 22 01:14:55 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.repository;
+package org.apache.rave.persistence;
 
 /**
  * Defines generic operations for a repository

Copied: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java
(from r1149420, incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/AbstractJpaRepository.java)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java?p2=incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java&p1=incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/AbstractJpaRepository.java&r1=1149420&r2=1149428&rev=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/AbstractJpaRepository.java
(original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java
Fri Jul 22 01:14:55 2011
@@ -17,20 +17,19 @@
  * under the License.
  */
 
-package org.apache.rave.portal.repository.impl;
+package org.apache.rave.persistence.jpa;
 
-import org.apache.rave.portal.model.BasicEntity;
-import org.apache.rave.portal.repository.Repository;
-import org.springframework.core.type.ClassMetadata;
+import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.persistence.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.saveOrUpdate;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
 
 /**
- * Provides generic implementations of {@link org.apache.rave.portal.repository.Repository}
methods
+ * Provides generic implementations of {@link org.apache.rave.persistence.Repository} methods
  */
 public abstract class AbstractJpaRepository<T extends BasicEntity> implements Repository<T>
{
 

Modified: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java?rev=1149428&r1=1149421&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
(original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
Fri Jul 22 01:14:55 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.orm.jpa;
+package org.apache.rave.persistence.jpa;
 
 import org.apache.rave.jdbc.util.DataSourcePopulator;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;

Modified: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java?rev=1149428&r1=1149420&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java
(original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java
Fri Jul 22 01:14:55 2011
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.rave.portal.repository.impl.util;
+package org.apache.rave.persistence.jpa.util;
 
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 

Modified: incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/JpaUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/JpaUtilTest.java?rev=1149428&r1=1149420&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/JpaUtilTest.java
(original)
+++ incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/persistence/jpa/JpaUtilTest.java
Fri Jul 22 01:14:55 2011
@@ -17,8 +17,9 @@
  * under the License.
  */
 
-package org.apache.rave.portal.repository.impl.util;
+package org.apache.rave.persistence.jpa;
 
+import org.apache.rave.persistence.jpa.util.JpaUtil;
 import org.junit.Test;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Page.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Page.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Page.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Page.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 import java.util.List;
 
@@ -32,7 +34,7 @@ import java.util.List;
         @NamedQuery(name = "Page.getByUserId", query="SELECT p FROM Page p WHERE p.owner.id
= :userId")
 })
 @Access(AccessType.FIELD)
-public class Page implements BasicEntity{
+public class Page implements BasicEntity {
     @Id @Column(name="id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "pageIdSeq")
     private Long id;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/PageLayout.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/PageLayout.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/PageLayout.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/PageLayout.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,8 @@
 
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 
 /**

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Region.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Region.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Region.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Region.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 import java.util.List;
 
@@ -28,7 +30,7 @@ import java.util.List;
 @Table(name="region")
 @SequenceGenerator(name="regionIdSeq", sequenceName = "region_id_seq")
 @Access(AccessType.FIELD)
-public class Region implements BasicEntity{
+public class Region implements BasicEntity {
     @Id @Column(name="id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "regionIdSeq")
     private Long id;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidget.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidget.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidget.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidget.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 import java.util.List;
 
@@ -27,7 +29,7 @@ import java.util.List;
 @Entity
 @Table(name = "region_widget")
 @SequenceGenerator(name = "regionWidgetIdSeq", sequenceName = "region_widget_id_seq")
-public class RegionWidget implements BasicEntity{
+public class RegionWidget implements BasicEntity {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "regionWidgetIdSeq")

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,8 @@
 
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -29,7 +31,7 @@ import javax.xml.bind.annotation.XmlRoot
 @Table(name = "region_widget_preference")
 @SequenceGenerator(name = "regionWidgetPrefIdSeq", sequenceName = "region_widget_pref_id_seq")
 @XmlRootElement
-public class RegionWidgetPreference implements BasicEntity{
+public class RegionWidgetPreference implements BasicEntity {
     @Id
     @Column(name = "id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "regionWidgetPrefIdSeq")

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/User.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/User.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/User.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Widget.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Widget.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Widget.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/model/Widget.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,8 @@
  */
 package org.apache.rave.portal.model;
 
+import org.apache.rave.persistence.BasicEntity;
+
 import javax.persistence.*;
 
 /**
@@ -29,7 +31,7 @@ import javax.persistence.*;
 @NamedQueries({
         @NamedQuery(name = "Widget.getAll", query = "SELECT w from Widget w")
 })
-public class Widget implements BasicEntity{
+public class Widget implements BasicEntity {
     @Id @Column(name="id")
     @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "widgetIdSeq")
     private Long id;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageLayoutRepository.java
Fri Jul 22 01:14:55 2011
@@ -18,8 +18,9 @@
  */
 package org.apache.rave.portal.repository;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.PageLayout;
 
-public interface PageLayoutRepository extends Repository<PageLayout> { 
+public interface PageLayoutRepository extends Repository<PageLayout> {
 	 PageLayout getByPageLayoutCode(String codename);
 }
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/PageRepository.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.rave.portal.repository;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.Page;
 
 import java.util.List;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,9 +19,10 @@
 package org.apache.rave.portal.repository;
 
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.Region;
 
 /**
  * Provides persistence operations for the {@link Region} class
  */
-public interface RegionRepository extends Repository<Region>{ }
\ No newline at end of file
+public interface RegionRepository extends Repository<Region> { }
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.rave.portal.repository;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.RegionWidget;
 
 public interface RegionWidgetRepository extends Repository<RegionWidget> { }
\ No newline at end of file

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/UserRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/UserRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/UserRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/UserRepository.java
Fri Jul 22 01:14:55 2011
@@ -18,8 +18,9 @@
  */
 package org.apache.rave.portal.repository;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.User;
 
-public interface UserRepository extends Repository<User>{
+public interface UserRepository extends Repository<User> {
     User getByUsername(String username);
 }

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
Fri Jul 22 01:14:55 2011
@@ -18,6 +18,7 @@
  */
 package org.apache.rave.portal.repository;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.Widget;
 
 import java.util.List;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,13 +19,15 @@
 
 package org.apache.rave.portal.repository.impl;
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.PageLayout;
 import org.apache.rave.portal.repository.PageLayoutRepository;
 import org.springframework.stereotype.Repository;
 
 import javax.persistence.TypedQuery;
 
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.getSingleResult;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
+
 
 /**
  */

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,7 @@
 
 package org.apache.rave.portal.repository.impl;
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.Page;
 import org.apache.rave.portal.repository.PageRepository;
 import org.springframework.stereotype.Repository;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,7 @@
 
 package org.apache.rave.portal.repository.impl;
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.Region;
 import org.apache.rave.portal.repository.RegionRepository;
 import org.springframework.stereotype.Repository;
@@ -26,7 +27,6 @@ import org.springframework.stereotype.Re
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.saveOrUpdate;
 
 @Repository
 public class JpaRegionRepository extends AbstractJpaRepository<Region> implements RegionRepository
{

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,7 @@
 
 package org.apache.rave.portal.repository.impl;
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.RegionWidget;
 import org.apache.rave.portal.repository.RegionWidgetRepository;
 import org.springframework.stereotype.Repository;
@@ -27,7 +28,6 @@ import org.springframework.transaction.a
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.saveOrUpdate;
 
 @Repository
 public class JpaRegionWidgetRepository extends AbstractJpaRepository<RegionWidget>
implements RegionWidgetRepository {

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,7 @@
 
 package org.apache.rave.portal.repository.impl;
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.User;
 import org.apache.rave.portal.repository.UserRepository;
 import org.springframework.stereotype.Repository;
@@ -27,8 +28,7 @@ import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.getSingleResult;
-import static org.apache.rave.portal.repository.impl.util.JpaUtil.saveOrUpdate;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.getSingleResult;
 
 /**
  */

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
Fri Jul 22 01:14:55 2011
@@ -20,6 +20,7 @@
 package org.apache.rave.portal.repository.impl;
 
 
+import org.apache.rave.persistence.jpa.AbstractJpaRepository;
 import org.apache.rave.portal.model.Widget;
 import org.apache.rave.portal.repository.WidgetRepository;
 import org.springframework.stereotype.Repository;

Modified: incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
(original)
+++ incubator/rave/trunk/rave-portal/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
Fri Jul 22 01:14:55 2011
@@ -19,6 +19,7 @@
 
 package org.apache.rave.portal.service.impl;
 
+import org.apache.rave.persistence.Repository;
 import org.apache.rave.portal.model.Page;
 import org.apache.rave.portal.model.Region;
 import org.apache.rave.portal.model.RegionWidget;

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/applicationContext.xml Fri Jul
22 01:14:55 2011
@@ -56,7 +56,7 @@
     </bean>
 
     <bean id="entityManagerFactory"
-          class="org.apache.rave.orm.jpa.PopulatedLocalContainerEntityManagerFactory">
+          class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory">
         <property name="populator" ref="dataSourcePopulator" />
         <property name="persistenceUnitName" value="ravePersistenceUnit"/>
         <property name="dataSource" ref="dataSource"/>

Modified: incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java?rev=1149428&r1=1149427&r2=1149428&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java
(original)
+++ incubator/rave/trunk/rave-portal/src/test/java/org/apache/rave/portal/repository/AbstractJpaRepositoryTest.java
Fri Jul 22 01:14:55 2011
@@ -19,8 +19,8 @@
 
 package org.apache.rave.portal.repository;
 
-import org.apache.rave.portal.model.BasicEntity;
-import org.apache.rave.portal.repository.impl.AbstractJpaRepository;
+import org.apache.rave.persistence.BasicEntity;
+import org.apache.rave.persistence.Repository;
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;



Mime
View raw message