Correct. Dan is goin to do the work of the interface merge and we had split the previous repository work. I went ahead and applied so that he can patch against the current state.
On Monday, July 29, 2013, Chris Geer wrote: > Erin, so since you applied the patch as is, are you just planning on making > the changes we discussed in the review after the fact? > > > On Mon, Jul 29, 2013 at 9:14 AM, <[email protected]> wrote: > > > Author: erinnp > > Date: Mon Jul 29 16:14:50 2013 > > New Revision: 1508123 > > > > URL: http://svn.apache.org/r1508123 > > Log: > > RAVE 998: Applying patch from dan gornstein. > > > > Modified: > > > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java > > > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java > > > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java > > > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java > > > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.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-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java > > > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java > > > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java > > > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java > > > > > rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java > > > > > rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java > > > > > rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java > > > > > rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java > > > > > rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java > > > > > rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java > > > > > rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java > > > > > rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java > > > > > rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java > > > > > rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java > > > > > rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java > > > > > rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java > > > > Modified: > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java > > URL: > > > http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff > > > > > ============================================================================== > > --- > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java > > (original) > > +++ > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java > > Mon Jul 29 16:14:50 2013 > > @@ -21,15 +21,14 @@ package org.apache.rave.portal.repositor > > > > import org.apache.rave.repository.Repository; > > import org.apache.rave.model.PortalPreference; > > +import org.apache.rave.repository.ResourceRepository; > > > > import java.util.List; > > > > /** > > * Provides persistence operations for the {@link > > org.apache.rave.model.PortalPreference} > > */ > > -public interface PortalPreferenceRepository extends > > Repository<PortalPreference> { > > - > > - List<PortalPreference> getAll(); > > +public interface PortalPreferenceRepository extends > > Repository<PortalPreference>, ResourceRepository<PortalPreference> { > > > > PortalPreference getByKey(String key); > > } > > > > Modified: > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java > > URL: > > > http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff > > > > > ============================================================================== > > --- > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java > > (original) > > +++ > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionRepository.java > > Mon Jul 29 16:14:50 2013 > > @@ -21,8 +21,9 @@ package org.apache.rave.portal.repositor > > > > import org.apache.rave.repository.Repository; > > import org.apache.rave.model.Region; > > +import org.apache.rave.repository.ResourceRepository; > > > > /** > > * 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>, > > ResourceRepository<Region> { } > > \ No newline at end of file > > > > Modified: > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java > > URL: > > > http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff > > > > > ============================================================================== > > --- > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java > > (original) > > +++ > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/RegionWidgetRepository.java > > Mon Jul 29 16:14:50 2013 > > @@ -20,5 +20,6 @@ package org.apache.rave.portal.repositor > > > > import org.apache.rave.repository.Repository; > > import org.apache.rave.model.RegionWidget; > > +import org.apache.rave.repository.ResourceRepository; > > > > -public interface RegionWidgetRepository extends Repository<RegionWidget> > > { } > > \ No newline at end of file > > +public interface RegionWidgetRepository extends > Repository<RegionWidget>, > > ResourceRepository<RegionWidget> { } > > \ No newline at end of file > > > > Modified: > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java > > URL: > > > http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java?rev=1508123&r1=1508122&r2=1508123&view=diff > > > > > ============================================================================== > > --- > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java > > (original) > > +++ > > > rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java > > Mon Jul 29 16:14:50 2013 > > @@ -20,10 +20,11 @@ package org.apache.rave.portal.repositor > > > > import org.apache.rave.repository.Repository; > > import org.apache.rave.model.User; > > +import org.apache.rave.repository.ResourceRepository; > > > > import java.util.List; > > > > -public interface UserRepository extends Repository<User> { > > +public interface UserRepository extends Repository<User>, > > ResourceRepository<User> { > > > > /** > > * Gets a {@link org.apache.rave.model.User} by its username > > > > Modified: > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java > > URL: > > > http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java?rev=1508123&r1=1508122&r2=1508123&view=diff > > > > > ============================================================================== > > --- > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java > > (original) > > +++ > > > rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java > > Mon Jul 29 16:14:50 2013 > > @@ -51,6 +51,7 @@ import java.util.List; > > @Table(name = "portal_preference") > > @NamedQueries({ > > @NamedQuery(name = JpaPortalPreference.GET_ALL, query = "SELECT > > pp FROM JpaPortalPreference pp"), > > + @NamedQuery(name = JpaPortalPreference.COUNT_ALL, query = > "SELECT > > count(pp) FROM JpaPortalPreference pp"), > > @NamedQuery(name = JpaPortalPreference.GET_BY_KEY, > > query = "SELECT pp FROM JpaPortalPreference pp WHERE > > pp.key = :" + JpaPortalPreference.PARAM_KEY) > > }) > > @@ -59,6 +60,7 @@ public class JpaPortalPreference impleme > > private static final long serialVersionUID = 1L; > > > > public static final String GET_ALL = "PortalPreference.getAll"; > > + public static final String COUNT_ALL = "PortalPreference.countAll"; > > public static final String GET_BY_KEY = "PortalPreference.getByKey"; > > public static final String PARAM_KEY = "key"; > > > > > > 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=1508123&r1=1508122&r2=1508123&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 > > Mon Jul 29 16:14:50 2013 > > @@ -41,15 +41,22 @@ import java.util.List; > > @Entity > > @Table(name="region") > > @Access(AccessType.FIELD) > > -@NamedQueries( > > - @NamedQuery(name = JpaRegion.FIND_BY_ENTITY_ID, query="select r > > from JpaRegion r where r.entityId = :entity_id") > > -) > > +@NamedQueries({ > > + @NamedQuery(name = JpaRegion.FIND_BY_ENTITY_ID, query="select r > > from JpaRegion r where r.entityId = :entity_id"), > > + @NamedQuery(name = JpaRegion.REGION_GET_ALL, query = > > JpaRegion.SELECT_R_FROM_REGION_R), > > + @NamedQuery(name = JpaRegion.REGION_COUNT_ALL, query = > > JpaRegion.SELECT_COUNT_R_FROM_REGION_R) > > +}) > > public class JpaRegion implements BasicEntity, Serializable, Region { > > private static final long serialVersionUID = 1L; > > > > public static final String FIND_BY_ENTITY_ID = > > "Region.findByEntityId"; > > + public static final String REGION_GET_ALL = "Region.getAll"; > > + public static final String REGION_COUNT_ALL = "Region.countAll"; > > public static final String ENTITY_ID_PARAM = "entity_id"; > > > > + static final String SELECT_R_FROM_REGION_R = "SELECT r FROM > JpaRegion > > r order by r.entityId"; > > + static final String SELECT_COUNT_R_FROM_REGION_R = "SELECT count(r) > > FROM JpaRegion r "; > > + > > @Id @Column(name="entity_id") > > @GeneratedValue(strategy = GenerationType.TABLE, generator = > > "regionIdGenerator") > > @TableGenerator(name = "regionIdGenerator", table = > > "RAVE_PORTAL_SEQUENCES", pkColumnName = "SEQ_NAME", > > > > 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=1508123&r1=1508122&r2=1508123&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 > > Mon Jul 29 16:14:50 2013 > > @@ -42,7 +42,9 @@ import java.util.List; > > @NamedQuery(name = > > JpaRegionWidget.REGION_WIDGET_GET_DISTINCT_USER_COUNT_SINGLE_WIDGET, > > query = "select count(distinct > > rw.region.page.ownerId) from JpaRegionWidget rw where rw.widgetId = > > :widgetId"), > > @NamedQuery(name = JpaRegionWidget.FIND_BY_ID, > > - query = "select rw from JpaRegionWidget rw where > > rw.entityId = :widgetId") > > + query = "select rw from JpaRegionWidget rw where > > rw.entityId = :widgetId"), > > + @NamedQuery(name = JpaRegionWidget.REGION_WIDGET_GET_ALL, query > = > > JpaRegionWidget.SELECT_R_FROM_REGION_WIDGET_R), > > + @NamedQuery(name = JpaRegionWidget.REGION_WIDGET_COUNT_ALL, > query > > = JpaRegionWidget.SELECT_COUNT_R_FROM_REGION_WIDGET_R) > > }) > > public class JpaRegionWidget implements BasicEntity, Serializable, > > RegionWidget { > > private static final long serialVersionUID = 1L; > > @@ -50,9 +52,15 @
