You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/06/11 22:13:01 UTC
svn commit: r1348990 [1/3] - in /rave/branches/model_interfaces: ./
rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave-c...
Author: mfranklin
Date: Mon Jun 11 20:12:56 2012
New Revision: 1348990
URL: http://svn.apache.org/viewvc?rev=1348990&view=rev
Log:
Moved JPA classes out of rave-core RAVE-665
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAddress.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPage.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageLayout.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageLayout.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegion.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaTag.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaUser.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidget.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/META-INF/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/META-INF/persistence.xml
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/persistence.xml
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml (with props)
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PageTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java
- copied unchanged from r1348814, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/UserTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
- copied unchanged from r1348817, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/
- copied from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
- copied unchanged from r1348817, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
- copied unchanged from r1348873, rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/log4j.xml
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/log4j.xml
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/portal.properties
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/portal.properties
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
- copied, changed from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test-applicationContext.xml
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-dataContext.xml
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test-dataContext.xml
rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test_data.sql
- copied unchanged from r1348807, rave/branches/model_interfaces/rave-components/rave-core/src/test/resources/test_data.sql
Removed:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAddress.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaGroup.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPage.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageLayout.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPerson.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegion.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaTag.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaUser.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidget.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/META-INF/
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PageTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/core-applicationContext.xml
Modified:
rave/branches/model_interfaces/pom.xml
rave/branches/model_interfaces/rave-components/rave-core/pom.xml
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java
rave/branches/model_interfaces/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java
rave/branches/model_interfaces/rave-portal-dependencies/pom.xml
rave/branches/model_interfaces/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
rave/branches/model_interfaces/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
rave/branches/model_interfaces/rave-portal/src/test/resources/test-applicationContext.xml
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
rave/branches/model_interfaces/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
Modified: rave/branches/model_interfaces/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/pom.xml?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/pom.xml (original)
+++ rave/branches/model_interfaces/pom.xml Mon Jun 11 20:12:56 2012
@@ -116,6 +116,11 @@
</dependency>
<dependency>
<groupId>org.apache.rave</groupId>
+ <artifactId>rave-jpa</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
<artifactId>rave-web</artifactId>
<version>${project.version}</version>
</dependency>
Modified: rave/branches/model_interfaces/rave-components/rave-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/pom.xml?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/pom.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/pom.xml Mon Jun 11 20:12:56 2012
@@ -79,10 +79,6 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-orm</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
</dependency>
@@ -101,18 +97,6 @@
<version>20090211</version>
</dependency>
- <!--Persistence-->
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <scope>test</scope>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -176,40 +160,5 @@
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>1.2</version>
- <configuration>
- <includes>org/apache/rave/portal/model/*.class</includes>
- <excludes>org/apache/rave/portal/model/WidgetStatus.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </exclusion>
- </exclusions>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
</build>
</project>
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Mon Jun 11 20:12:56 2012
@@ -101,4 +101,6 @@ public interface User extends Person, Us
Long getId();
String getDefaultPageLayoutCode();
+
+ void setDefaultPageLayoutCode(String pageLayoutCode);
}
Added: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java?rev=1348990&view=auto
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java (added)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java Mon Jun 11 20:12:56 2012
@@ -0,0 +1,74 @@
+package org.apache.rave.portal.model.impl;
+
+import org.apache.rave.exception.NotSupportedException;
+import org.apache.rave.portal.model.PortalPreference;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+public class PortalPreferenceImpl implements PortalPreference {
+ private String key;
+ private List<String> values = new LinkedList<String>();
+
+ public PortalPreferenceImpl(String key, List<String> values) {
+ this.key = key;
+ this.values = values;
+ }
+
+ public PortalPreferenceImpl(String key, String values) {
+ this.key = key;
+ this.values.add(values);
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public List<String> getValues() {
+ return values;
+ }
+
+ public void setValues(List<String> values) {
+ this.values = values;
+ }
+
+ public String getValue() {
+ if (values.isEmpty()) {
+ return null;
+ } else if (values.size() == 1) {
+ return values.get(0);
+ }
+ throw new NotSupportedException("Cannot return single value for a List of size " + values.size());
+ }
+
+ public void setValue(String value) {
+ List<String> values = new ArrayList<String>();
+ values.add(value);
+ this.values = values;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PortalPreferenceImpl)) return false;
+
+ PortalPreferenceImpl that = (PortalPreferenceImpl) o;
+
+ if (key != null ? !key.equals(that.key) : that.key != null) return false;
+ if (values != null ? !values.equals(that.values) : that.values != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = key != null ? key.hashCode() : 0;
+ result = 31 * result + (values != null ? values.hashCode() : 0);
+ return result;
+ }
+}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java Mon Jun 11 20:12:56 2012
@@ -25,7 +25,7 @@ public class UserImpl extends PersonImpl
private PageLayout defaultPageLayout;
private String confirmPassword;
private String defaultPageLayoutCode;
- private List<Authority> authorities;
+ private List<Authority> authorities = new ArrayList<Authority>();
public UserImpl() {}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java Mon Jun 11 20:12:56 2012
@@ -9,6 +9,16 @@ public class WidgetRatingImpl implements
private Long userId;
private Integer score;
+ public WidgetRatingImpl() {
+ }
+
+ public WidgetRatingImpl(long id, long widgetId, long userId, int score) {
+ this.id = id;
+ this.widgetId = widgetId;
+ this.userId = userId;
+ this.score = score;
+ }
+
public Long getId() {
return id;
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java Mon Jun 11 20:12:56 2012
@@ -15,7 +15,6 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetComment;
import org.apache.rave.portal.repository.WidgetCommentRepository;
@@ -192,6 +191,6 @@ public class DefaultWidgetCommentPermiss
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
private boolean isWidgetCommentOwnerById(Authentication authentication, Long userId) {
- return ((JpaUser)authentication.getPrincipal()).getId().equals(userId);
+ return ((User)authentication.getPrincipal()).getId().equals(userId);
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java Mon Jun 11 20:12:56 2012
@@ -15,7 +15,6 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.WidgetTag;
import org.apache.rave.portal.repository.WidgetTagRepository;
@@ -194,6 +193,6 @@ public class DefaultWidgetTagPermissionE
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
private boolean isWidgetTagOwnerById(Authentication authentication, Long userId) {
- return ((JpaUser)authentication.getPrincipal()).getId().equals(userId);
+ return ((User)authentication.getPrincipal()).getId().equals(userId);
}
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java Mon Jun 11 20:12:56 2012
@@ -30,14 +30,14 @@ import java.util.Map;
public interface PortalPreferenceService {
/**
- * Creates a Map of all {@link org.apache.rave.portal.model.JpaPortalPreference}'s using the preference key as key for the Map.Entry
+ * Creates a Map of all {@link org.apache.rave.portal.model.PortalPreference}'s using the preference key as key for the Map.Entry
*
* @return Map of PortalPreference's
*/
Map<String, PortalPreference> getPreferencesAsMap();
/**
- * Gets a {@link org.apache.rave.portal.model.JpaPortalPreference} by its key
+ * Gets a {@link org.apache.rave.portal.model.PortalPreference} by its key
*
* @param key unique name of the preference
* @return PortalPreference if it exists, otherwise {@literal null}
@@ -45,7 +45,7 @@ public interface PortalPreferenceService
PortalPreference getPreference(String key);
/**
- * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference} with a single value.
+ * Saves a {@link org.apache.rave.portal.model.PortalPreference} with a single value.
* If a PortalPreference already exists with this key, its value(s) will be overwritten.
*
* @param key of the preference, e.g. {@literal title}
@@ -54,7 +54,7 @@ public interface PortalPreferenceService
void savePreference(String key, String value);
/**
- * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference} with a List of values.
+ * Saves a {@link org.apache.rave.portal.model.PortalPreference} with a List of values.
* If a PortalPreference already exists with this key, its value(s) will be overwritten.
*
* @param key of the preference, e.g. {@literal colors}
@@ -63,7 +63,7 @@ public interface PortalPreferenceService
void savePreference(String key, List<String> values);
/**
- * Saves a {@link org.apache.rave.portal.model.JpaPortalPreference}
+ * Saves a {@link org.apache.rave.portal.model.PortalPreference}
*
* @param preference PortalPreference to save
*/
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java Mon Jun 11 20:12:56 2012
@@ -20,8 +20,8 @@
package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.PageLayoutService;
@@ -65,7 +65,7 @@ public class DefaultNewAccountService im
throwExceptionIfUserExists(userName, email);
- User user = new JpaUser();
+ User user = new UserImpl();
//set the required fields
user.setUsername(userName);
user.setEmail(email);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Mon Jun 11 20:12:56 2012
@@ -23,6 +23,8 @@ import org.apache.rave.persistence.Repos
import org.apache.rave.portal.model.*;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageUserImpl;
+import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.RegionWidgetImpl;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.PageTemplateRepository;
@@ -136,7 +138,7 @@ public class DefaultPageService implemen
List<Page> parentsSubPages = new ArrayList<Page>();
int regionCount;
for (regionCount = 0; regionCount < pageLayout.getNumberOfRegions(); regionCount++) {
- Region region = new JpaRegion();
+ Region region = new RegionImpl();
region.setRenderOrder(regionCount);
// TODO: this should eventually be defined by the PageTemplateRegion.locked field
region.setLocked(false);
@@ -396,7 +398,7 @@ public class DefaultPageService implemen
//add as many missing regions as the new layout requires
for (int i=0; i < numberOfNewRegionsToAdd; i++) {
- Region newRegion = new JpaRegion();
+ Region newRegion = new RegionImpl();
newRegion.setPage(page);
newRegion.setRenderOrder(lastRegionRenderOrder++);
newRegion.setLocked(false);
@@ -443,7 +445,7 @@ public class DefaultPageService implemen
}
private RegionWidget createWidgetInstance(Widget widget, Region region, int position) {
- RegionWidget regionWidget = new JpaRegionWidget();
+ RegionWidget regionWidget = new RegionWidgetImpl();
regionWidget.setRenderOrder(position);
regionWidget.setWidget(widget);
// TODO: setLocked and setHideChrome are hard-coded to false for new widgets manually added by users
@@ -482,7 +484,7 @@ public class DefaultPageService implemen
List<Region> regions = new ArrayList<Region>();
int regionCount;
for (regionCount = 0; regionCount < pageLayout.getNumberOfRegions(); regionCount++) {
- Region region = new JpaRegion();
+ Region region = new RegionImpl();
region.setRenderOrder(regionCount);
// TODO: this should eventually be defined by the PageTemplateRegion.locked field
region.setLocked(false);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java Mon Jun 11 20:12:56 2012
@@ -19,8 +19,8 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.JpaPortalPreference;
import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,7 +71,7 @@ public class DefaultPortalPreferenceServ
public void savePreference(String key, List<String> values) {
PortalPreference preference = getPreference(key);
if (preference == null) {
- preference = new JpaPortalPreference(key, values);
+ preference = new PortalPreferenceImpl(key, values);
} else {
preference.setValues(values);
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Mon Jun 11 20:12:56 2012
@@ -21,7 +21,6 @@ package org.apache.rave.portal.service.i
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.PageType;
import org.apache.rave.portal.model.Person;
import org.apache.rave.portal.model.User;
@@ -124,11 +123,11 @@ public class DefaultUserService implemen
}
@Override
- public JpaUser getAuthenticatedUser() {
+ public User getAuthenticatedUser() {
Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication != null && authentication.getPrincipal() instanceof JpaUser) {
- return (JpaUser) authentication.getPrincipal();
+ if (authentication != null && authentication.getPrincipal() instanceof User) {
+ return (User) authentication.getPrincipal();
} else {
throw new SecurityException("Could not get the authenticated user!");
}
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml Mon Jun 11 20:12:56 2012
@@ -55,38 +55,6 @@
<context:component-scan base-package="org.apache.rave.portal.service"/>
<context:component-scan base-package="org.apache.rave.portal.security"/>
- <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
- <property name="entityManagerFactory" ref="entityManagerFactory"/>
- </bean>
-
- <tx:annotation-driven transaction-manager="transactionManager"/>
-
- <bean id="entityManagerFactory"
- class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory">
- <property name="populator" ref="dataSourcePopulator"/>
- <property name="loadTimeWeaver">
- <bean class="org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver"/>
- </property>
- <property name="persistenceUnitName" value="ravePersistenceUnit"/>
- <property name="dataSource" ref="dataSource"/>
- <property name="jpaVendorAdapter">
- <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter"
- p:databasePlatform="${portal.jpaVendorAdapter.databasePlatform}"
- p:database="${portal.jpaVendorAdapter.database}"
- p:showSql="${portal.jpaVendorAdapter.showSql}"/>
- </property>
- <property name="jpaDialect">
- <bean class="${portal.jpaDialect}"/>
- </property>
- <property name="jpaPropertyMap">
- <map>
- <entry key="openjpa.Log" value="${portal.openjpa.Log}"/>
- <entry key="openjpa.RuntimeUnenhancedClasses" value="${portal.openjpa.RuntimeUnenhancedClasses}"/>
- <entry key="openjpa.jdbc.SynchronizeMappings" value="${portal.openjpa.jdbc.SynchronizeMappings}"/>
- </map>
- </property>
- </bean>
-
<bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
<property name="url" value="${portal.dataSource.url}"/>
<property name="driverClassName" value="${portal.dataSource.driver}"/>
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Mon Jun 11 20:12:56 2012
@@ -19,7 +19,6 @@
package org.apache.rave.portal.model.util;
-import org.apache.rave.portal.model.JpaRegionWidgetPreference;
import org.apache.rave.portal.model.RegionWidgetPreference;
import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.junit.Test;
@@ -34,7 +33,7 @@ public class ModelUtilsTest {
@Test
public void normalizeRegionWidgetPreference() {
- RegionWidgetPreference testPreference = new JpaRegionWidgetPreference(null, null, "camelCaseName", "FOO");
+ RegionWidgetPreference testPreference = new RegionWidgetPreferenceImpl( null, "camelCaseName", "FOO");
ModelUtils.normalizeRegionWidgetPreference(VALID_REGION_WIDGET_ID, testPreference);
assertTrue(testPreference.getRegionWidgetId() == VALID_REGION_WIDGET_ID);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -18,8 +18,10 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Category;
+import org.apache.rave.portal.model.Widget;
import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -43,7 +45,7 @@ public class DefaultCategoryPermissionEv
private CategoryRepository mockCategoryRepository;
private Category category;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthorities;
@@ -58,10 +60,10 @@ public class DefaultCategoryPermissionEv
defaultCategoryPermissionEvaluator = new DefaultCategoryPermissionEvaluator(mockCategoryRepository);
mockAuthentication = createMock(Authentication.class);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
category = new CategoryImpl();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -19,10 +19,10 @@
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageType;
import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -50,7 +50,7 @@ public class DefaultPagePermissionEvalua
private PageRepository mockPageRepository;
private Authentication mockAuthentication;
private Page page, personProfilePage, pageSubPage, personProfileSubPage;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
private final Long VALID_USER_ID = 99L;
@@ -68,10 +68,10 @@ public class DefaultPagePermissionEvalua
defaultPagePermissionEvaluator = new DefaultPagePermissionEvaluator(mockPageRepository);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
page = new PageImpl();
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -18,11 +18,11 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.RegionImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.RegionRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -46,7 +46,7 @@ public class DefaultRegionPermissionEval
private RegionRepository mockRegionRepository;
private Page page;
private Region region, region2;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
@@ -62,10 +62,10 @@ public class DefaultRegionPermissionEval
defaultRegionPermissionEvaluator = new DefaultRegionPermissionEvaluator(mockRegionRepository);
mockAuthentication = createMock(Authentication.class);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -18,10 +18,13 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Page;
+import org.apache.rave.portal.model.Region;
+import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.RegionImpl;
import org.apache.rave.portal.model.impl.RegionWidgetImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
import org.apache.rave.portal.security.util.AuthenticationUtils;
@@ -47,7 +50,7 @@ public class DefaultRegionWidgetPermissi
private Page page;
private RegionWidget regionWidget;
private Region region;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
private final Long VALID_REGION_ID = 1L;
@@ -63,10 +66,10 @@ public class DefaultRegionWidgetPermissi
defaultRegionWidgetPermissionEvaluator = new DefaultRegionWidgetPermissionEvaluator(mockRegionWidgetRepository);
mockAuthentication = createMock(Authentication.class);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -15,8 +15,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.WidgetComment;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetCommentImpl;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator.Permission;
@@ -45,7 +45,7 @@ public class DefaultWidgetCommentPermiss
private WidgetCommentRepository mockWidgetCommentRepository;
private Authentication mockAuthentication;
private WidgetComment widgetComment;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
private final Long VALID_COMMENT_ID = 3L;
@@ -60,12 +60,12 @@ public class DefaultWidgetCommentPermiss
mockAuthentication = createMock(Authentication.class);
defaultWidgetCommentPermissionEvaluator = new DefaultWidgetCommentPermissionEvaluator(mockWidgetCommentRepository);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
- user2.setEntityId(INVALID_USER_ID);
+ user2.setId(INVALID_USER_ID);
widgetComment = new WidgetCommentImpl();
widgetComment.setId(VALID_COMMENT_ID);
widgetComment.setUser(user);
@@ -225,8 +225,8 @@ public class DefaultWidgetCommentPermiss
replay(mockAuthentication);
WidgetComment localWidgetComment = new WidgetCommentImpl();
- JpaUser localUser = new JpaUser();
- localUser.setEntityId(VALID_USER_ID);
+ UserImpl localUser = new UserImpl();
+ localUser.setId(VALID_USER_ID);
localWidgetComment.setUser(localUser);
expect(mockWidgetCommentRepository.get(VALID_COMMENT_ID)).andReturn(localWidgetComment).anyTimes();
replay(mockWidgetCommentRepository);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -18,8 +18,11 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.portal.model.Page;
+import org.apache.rave.portal.model.Widget;
+import org.apache.rave.portal.model.WidgetStatus;
import org.apache.rave.portal.model.impl.PageImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.repository.WidgetRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
@@ -44,7 +47,7 @@ public class DefaultWidgetPermissionEval
private WidgetRepository mockWidgetRepository;
private Page page;
private Widget widget, widget2;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
@@ -60,10 +63,10 @@ public class DefaultWidgetPermissionEval
defaultWidgetPermissionEvaluator = new DefaultWidgetPermissionEvaluator(mockWidgetRepository);
mockAuthentication = createMock(Authentication.class);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
user2.setUsername(VALID_USERNAME2);
page = new PageImpl();
page.setId(VALID_PAGE_ID);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java Mon Jun 11 20:12:56 2012
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.model.impl.WidgetRatingImpl;
import org.apache.rave.portal.repository.WidgetRatingRepository;
import org.apache.rave.portal.security.ModelPermissionEvaluator;
@@ -46,7 +46,7 @@ public class DefaultWidgetRatingPermissi
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
private WidgetRating widgetRating;
- private JpaUser user, user2;
+ private UserImpl user, user2;
private final Long VALID_USER_ID = 99L;
private final Long VALID_USER_ID2 = 100L;
@@ -65,11 +65,11 @@ public class DefaultWidgetRatingPermissi
widgetRating.setWidgetId(VALID_WIDGET_ID);
widgetRating.setId(VALID_WIDGET_ID);
- user = new JpaUser();
+ user = new UserImpl();
user.setUsername(VALID_USERNAME);
- user.setEntityId(VALID_USER_ID);
- user2 = new JpaUser();
- user2.setEntityId(VALID_USER_ID2);
+ user.setId(VALID_USER_ID);
+ user2 = new UserImpl();
+ user2.setId(VALID_USER_ID2);
user2.setUsername(VALID_USERNAME2);
mockAuthentication = createMock(Authentication.class);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,20 +20,19 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.JpaAuthority;
+import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.AuthorityRepository;
+import org.apache.rave.portal.service.AuthorityService;
import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
import java.util.List;
-import org.apache.rave.portal.service.AuthorityService;
import static org.easymock.EasyMock.*;
-
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
/**
Test for {@link org.apache.rave.portal.service.impl.DefaultAuthorityService}
@@ -75,19 +74,17 @@ public class DefaultAuthorityServiceTest
}
private static Authority createAuthority() {
- JpaAuthority authority = new JpaAuthority();
+ AuthorityImpl authority = new AuthorityImpl();
authority.setAuthority("FOO");
final long entityId = 123L;
- authority.setEntityId(entityId);
return authority;
}
@Test
public void getAuthorityById_NotFound() {
- JpaAuthority authority = new JpaAuthority();
+ AuthorityImpl authority = new AuthorityImpl();
authority.setAuthority("BAR");
final long entityId = 456L;
- authority.setEntityId(entityId);
expect(repository.get(entityId)).andReturn(null);
replay(repository);
@@ -100,9 +97,9 @@ public class DefaultAuthorityServiceTest
@Test
public void allAuthorities() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new JpaAuthority();
+ Authority foo = new AuthorityImpl();
foo.setAuthority("FOO");
- Authority bar = new JpaAuthority();
+ Authority bar = new AuthorityImpl();
bar.setAuthority("BAR");
authorities.add(foo);
authorities.add(bar);
@@ -120,10 +117,10 @@ public class DefaultAuthorityServiceTest
@Test
public void test_getAllDefault() {
List<Authority> authorities = new ArrayList<Authority>();
- Authority foo = new JpaAuthority();
+ Authority foo = new AuthorityImpl();
foo.setAuthority("FOO");
foo.setDefaultForNewUser(true);
- Authority bar = new JpaAuthority();
+ Authority bar = new AuthorityImpl();
bar.setAuthority("BAR");
bar.setDefaultForNewUser(true);
Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1348990&r1=1348989&r2=1348990&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Mon Jun 11 20:12:56 2012
@@ -20,9 +20,9 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.JpaUser;
import org.apache.rave.portal.model.User;
import org.apache.rave.portal.model.impl.CategoryImpl;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
import org.junit.Before;
@@ -60,8 +60,8 @@ public class DefaultCategoryServiceTest
repository = createMock(CategoryRepository.class);
service = new DefaultCategoryService(repository);
- validCreatedUser = new JpaUser(VALID_CREATED_USER_ID);
- validLastModifiedUser = new JpaUser(VALID_LAST_MODIFIED_USER_ID);
+ validCreatedUser = new UserImpl(VALID_CREATED_USER_ID);
+ validLastModifiedUser = new UserImpl(VALID_LAST_MODIFIED_USER_ID);
validCategory = new CategoryImpl();
validCategory.setId(VALID_ID);