You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2012/08/09 09:05:57 UTC
svn commit: r1371052 [1/6] - in /rave/branches/model-split:
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache...
Author: cgeer
Date: Thu Aug 9 07:05:51 2012
New Revision: 1371052
URL: http://svn.apache.org/viewvc?rev=1371052&view=rev
Log:
RAVE-753 Modified all the interfaces to use Strings for the IDs. Modified the JPA backend to convert between the strings and longs for JPA. All tests and integration tests are passing.
Modified:
rave/branches/model-split/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetCommentRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaApplicationData.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthConsumerStore.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthTokenInfo.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
rave/branches/model-split/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/PageApi.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/RegionWidgetApi.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ControllerUtils.java
rave/branches/model-split/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java
rave/branches/model-split/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java
rave/branches/model-split/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
rave/branches/model-split/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
rave/branches/model-split/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java
Modified: rave/branches/model-split/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java (original)
+++ rave/branches/model-split/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/Repository.java Thu Aug 9 07:05:51 2012
@@ -35,7 +35,7 @@ public interface Repository<T> {
* @param id the id of the object of type T to retrieve
* @return a valid instance if id exists; null otherwise
*/
- T get(long id);
+ T get(String id);
/**
* Save the given item in the repository
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java Thu Aug 9 07:05:51 2012
@@ -23,8 +23,8 @@ import java.util.Map;
@XmlTransient
public interface ApplicationData {
- Long getId();
- void setId(Long id);
+ String getId();
+ void setId(String id);
String getUserId();
void setUserId(String userId);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java Thu Aug 9 07:05:51 2012
@@ -27,8 +27,8 @@ import java.util.List;
*/
@XmlTransient
public interface Category {
- public Long getId();
- public void setId(Long id);
+ public String getId();
+ public void setId(String id);
public String getText();
public void setText(String text);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java Thu Aug 9 07:05:51 2012
@@ -31,8 +31,8 @@ public interface OAuthConsumerStore {
HMAC_SYMMETRIC, RSA_PRIVATE, PLAINTEXT
}
- Long getId();
- void setId(Long id);
+ String getId();
+ void setId(String id);
String getGadgetUri();
void setGadgetUri(String gadgetUri);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java Thu Aug 9 07:05:51 2012
@@ -28,8 +28,8 @@ public interface OAuthTokenInfo {
*/
public static final String MODULE_ID = "NOT_USED";
- Long getId();
- void setId(Long id);
+ String getId();
+ void setId(String id);
String getAccessToken();
void setAccessToken(String accessToken);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java Thu Aug 9 07:05:51 2012
@@ -23,8 +23,8 @@ import java.util.List;
@XmlTransient
public interface Page {
- Long getId();
- void setId(Long id);
+ String getId();
+ void setId(String id);
String getName();
void setName(String name);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java Thu Aug 9 07:05:51 2012
@@ -24,7 +24,7 @@ import java.util.List;
@XmlTransient
public interface PageTemplate {
- Long getId();
+ String getId();
PageType getPageType();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java Thu Aug 9 07:05:51 2012
@@ -26,7 +26,7 @@ import java.util.List;
@XmlTransient
public interface PageTemplateRegion {
- Long getId();
+ String getId();
long getRenderSequence();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java Thu Aug 9 07:05:51 2012
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTran
@XmlTransient
public interface PageTemplateWidget {
- Long getId();
+ String getId();
PageTemplateRegion getPageTemplateRegion();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java Thu Aug 9 07:05:51 2012
@@ -22,8 +22,7 @@ import javax.xml.bind.annotation.XmlTran
@XmlTransient
public interface PageUser {
- Long getId();
- void setId(Long id);
+ String getId();
boolean isEditor();
void setEditor(boolean editor);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java Thu Aug 9 07:05:51 2012
@@ -25,9 +25,7 @@ import javax.xml.bind.annotation.XmlTran
*/
@XmlTransient
public interface PersonProperty {
- Long getId();
-
- void setId(Long id);
+ String getId();
String getType();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java Thu Aug 9 07:05:51 2012
@@ -23,9 +23,7 @@ import java.util.List;
@XmlTransient
public interface Region {
- Long getId();
-
- void setId(Long id);
+ String getId();
Page getPage();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java Thu Aug 9 07:05:51 2012
@@ -26,9 +26,7 @@ import java.util.List;
@XmlTransient
public interface RegionWidget {
- Long getId();
-
- void setId(Long id);
+ String getId();
Widget getWidget();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java Thu Aug 9 07:05:51 2012
@@ -26,9 +26,9 @@ public interface RegionWidgetPreference
* Gets the ID of the RegionWidget this preference is for
* @return The ID of the RegionWidget this preference is for
*/
- Long getRegionWidgetId();
+ String getRegionWidgetId();
- void setRegionWidgetId(Long regionWidgetId);
+ void setRegionWidgetId(String regionWidgetId);
/**
* Gets the name of the preference
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java Thu Aug 9 07:05:51 2012
@@ -24,9 +24,8 @@ import java.util.List;
@XmlTransient
public interface Tag {
+ String getId();
String getKeyword();
void setKeyword(String keyword);
- List<WidgetTag> getWidgets();
- void setWidgets(List<WidgetTag> widgets);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java Thu Aug 9 07:05:51 2012
@@ -118,7 +118,7 @@ public interface User extends Person, Us
*/
Person toPerson();
- Long getId();
+ String getId();
String getDefaultPageLayoutCode();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java Thu Aug 9 07:05:51 2012
@@ -24,7 +24,7 @@ import java.util.List;
@XmlTransient
public interface Widget {
- Long getId();
+ String getId();
String getScreenshotUrl();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java Thu Aug 9 07:05:51 2012
@@ -27,14 +27,13 @@ import java.util.Date;
*/
@XmlTransient
public interface WidgetComment {
- Long getId();
- void setId(Long id);
+ String getId();
User getUser();
void setUser(User user);
- Long getWidgetId();
- void setWidgetId(Long widgetId);
+ String getWidgetId();
+ void setWidgetId(String widgetId);
String getText();
void setText(String text);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java Thu Aug 9 07:05:51 2012
@@ -28,17 +28,17 @@ public interface WidgetRating {
* Gets the ID of the Widget this rating is for
* @return The ID of the Widget this rating is for
*/
- Long getWidgetId();
+ String getWidgetId();
- void setWidgetId(Long widgetId);
+ void setWidgetId(String widgetId);
/**
* Gets the ID of the User this rating is for
* @return The ID of the User this rating is for
*/
- Long getUserId();
+ String getUserId();
- void setUserId(Long userId);
+ void setUserId(String userId);
/**
* Gets the score of this rating
@@ -49,7 +49,5 @@ public interface WidgetRating {
void setScore(Integer value);
- Long getId();
-
- void setId(Long id);
+ String getId();
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java Thu Aug 9 07:05:51 2012
@@ -23,11 +23,11 @@ import java.util.Date;
@XmlTransient
public interface WidgetTag {
-
- Long getWidgetId();
- void setWidgetId(Long id);
- User getUser();
- void setUser(User user);
+
+ String getId();
+ String getWidgetId();
+ String getUserId();
+ void setUserId(String userId);
Tag getTag();
void setTag(Tag tag);
Date getCreatedDate();
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java Thu Aug 9 07:05:51 2012
@@ -23,18 +23,18 @@ import org.apache.rave.portal.model.Appl
import java.util.Map;
public class ApplicationDataImpl implements ApplicationData {
- private Long id;
+ private String id;
private String userId;
private String appUrl;
private Map<String, String> data;
public ApplicationDataImpl() {}
- public ApplicationDataImpl(Long id) {
+ public ApplicationDataImpl(String id) {
this.id = id;
}
- public ApplicationDataImpl(Long id, String userId, String appUrl, Map<String, String> data) {
+ public ApplicationDataImpl(String id, String userId, String appUrl, Map<String, String> data) {
this.id = id;
this.userId = userId;
this.appUrl = appUrl;
@@ -42,12 +42,12 @@ public class ApplicationDataImpl impleme
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
@Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java Thu Aug 9 07:05:51 2012
@@ -24,7 +24,7 @@ import java.util.Date;
import java.util.List;
public class CategoryImpl implements Category {
- private Long id;
+ private String id;
private String text;
private User createdUser;
private Date createdDate;
@@ -36,17 +36,17 @@ public class CategoryImpl implements Cat
}
- public CategoryImpl(Long id) {
+ public CategoryImpl(String id) {
this.id = id;
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
@Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java Thu Aug 9 07:05:51 2012
@@ -22,7 +22,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.OAuthConsumerStore;
public class OAuthConsumerStoreImpl implements OAuthConsumerStore {
- private Long id;
+ private String id;
private String gadgetUri;
private String serviceName;
private String consumerKey;
@@ -32,12 +32,12 @@ public class OAuthConsumerStoreImpl impl
private String callbackUrl;
@Override
- public Long getId() {
+ public String getId() {
return id;
}
@Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java Thu Aug 9 07:05:51 2012
@@ -22,7 +22,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.OAuthTokenInfo;
public class OAuthTokenInfoImpl implements OAuthTokenInfo {
- private Long id;
+ private String id;
private String accessToken;
private String tokenSecret;
private String sessionHandle;
@@ -51,12 +51,12 @@ public class OAuthTokenInfoImpl implemen
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
@Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java Thu Aug 9 07:05:51 2012
@@ -23,7 +23,7 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class PageImpl implements Page {
- private Long id;
+ private String id;
private String name;
private User owner;
private Page parentPage;
@@ -35,22 +35,22 @@ public class PageImpl implements Page {
public PageImpl() {}
- public PageImpl(Long id) {
+ public PageImpl(String id) {
this.id = id;
}
- public PageImpl(Long id, User owner) {
+ public PageImpl(String id, User owner) {
this.id = id;
this.owner = owner;
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
@Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java Thu Aug 9 07:05:51 2012
@@ -23,7 +23,7 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class PageTemplateImpl implements PageTemplate {
- private Long id;
+ private String id;
private String name;
private String description;
private PageType pageType;
@@ -34,11 +34,19 @@ public class PageTemplateImpl implements
private long renderSequence;
private boolean defaultTemplate;
- public Long getId() {
+ public PageTemplateImpl() {
+
+ }
+
+ public PageTemplateImpl(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java Thu Aug 9 07:05:51 2012
@@ -23,17 +23,25 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class PageTemplateRegionImpl implements PageTemplateRegion {
- private Long id;
+ private String id;
private long renderSequence;
private PageTemplate pageTemplate;
private List<PageTemplateWidget> pageTemplateWidgets;
private boolean locked;
- public Long getId() {
+ public PageTemplateRegionImpl() {
+
+ }
+
+ public PageTemplateRegionImpl(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java Thu Aug 9 07:05:51 2012
@@ -21,18 +21,26 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.*;
public class PageTemplateWidgetImpl implements PageTemplateWidget {
- private Long id;
+ private String id;
private PageTemplateRegion pageTemplateRegion;
private long renderSequence;
private Widget widget;
private boolean locked;
private boolean hideChrome;
- public Long getId() {
+ public PageTemplateWidgetImpl() {
+
+ }
+
+ public PageTemplateWidgetImpl(String id) {
+ this.id = id;
+ }
+
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java Thu Aug 9 07:05:51 2012
@@ -21,7 +21,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.*;
public class PageUserImpl implements PageUser {
- private Long id;
+ private String id;
private User user;
private Page page;
private boolean editor;
@@ -30,7 +30,7 @@ public class PageUserImpl implements Pag
public PageUserImpl(){}
- public PageUserImpl(Long id){
+ public PageUserImpl(String id){
this.id = id;
}
@@ -47,12 +47,11 @@ public class PageUserImpl implements Pag
@Override
- public Long getId() {
+ public String getId() {
return id;
}
- @Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java Thu Aug 9 07:05:51 2012
@@ -23,7 +23,7 @@ import org.apache.rave.portal.model.Pers
/** **/
public class PersonPropertyImpl implements PersonProperty {
- private Long id;
+ private String id;
private String type;
private String value;
private String qualifier;
@@ -32,7 +32,11 @@ public class PersonPropertyImpl implemen
public PersonPropertyImpl() {}
- public PersonPropertyImpl(Long id, String type, String value, String extendedValue, String qualifier, Boolean primary) {
+ public PersonPropertyImpl(String id) {
+ this.id = id;
+ }
+
+ public PersonPropertyImpl(String id, String type, String value, String extendedValue, String qualifier, Boolean primary) {
this.id = id;
this.type = type;
this.value = value;
@@ -41,11 +45,11 @@ public class PersonPropertyImpl implemen
this.extendedValue = extendedValue;
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java Thu Aug 9 07:05:51 2012
@@ -25,7 +25,7 @@ import org.apache.rave.portal.model.Regi
import java.util.List;
public class RegionImpl implements Region {
- private Long id;
+ private String id;
private Page page;
private Boolean locked = false;
private Integer renderOrder = 0;
@@ -35,23 +35,22 @@ public class RegionImpl implements Regio
}
- public RegionImpl(Long id, Page page, int renderOrder) {
+ public RegionImpl(String id, Page page, int renderOrder) {
this.id = id;
this.page = page;
this.renderOrder = renderOrder;
}
- public RegionImpl(Long id) {
+ public RegionImpl(String id) {
this.id = id;
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
- @Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java Thu Aug 9 07:05:51 2012
@@ -26,7 +26,7 @@ import org.apache.rave.portal.model.Widg
import java.util.List;
public class RegionWidgetImpl implements RegionWidget {
- private Long id;
+ private String id;
private Widget widget;
private Region region;
private String renderPosition;
@@ -40,17 +40,17 @@ public class RegionWidgetImpl implements
}
- public RegionWidgetImpl(Long id) {
+ public RegionWidgetImpl(String id) {
this.id = id;
}
- public RegionWidgetImpl(Long id, Widget widget, Region region) {
+ public RegionWidgetImpl(String id, Widget widget, Region region) {
this.id = id;
this.widget = widget;
this.region = region;
}
- public RegionWidgetImpl(Long id, Widget widget, Region region, int renderOrder) {
+ public RegionWidgetImpl(String id, Widget widget, Region region, int renderOrder) {
this.id = id;
this.widget = widget;
this.region = region;
@@ -58,12 +58,11 @@ public class RegionWidgetImpl implements
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
- @Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java Thu Aug 9 07:05:51 2012
@@ -22,23 +22,23 @@ import org.apache.rave.portal.model.Regi
public class RegionWidgetPreferenceImpl implements RegionWidgetPreference {
- private Long regionWidgetId;
+ private String regionWidgetId;
private String name;
private String value;
public RegionWidgetPreferenceImpl() { }
- public RegionWidgetPreferenceImpl(Long regionWidgetId, String name, String value) {
+ public RegionWidgetPreferenceImpl(String regionWidgetId, String name, String value) {
this.regionWidgetId = regionWidgetId;
this.name = name;
this.value = value;
}
- public Long getRegionWidgetId() {
+ public String getRegionWidgetId() {
return regionWidgetId;
}
- public void setRegionWidgetId(Long regionWidgetId) {
+ public void setRegionWidgetId(String regionWidgetId) {
this.regionWidgetId = regionWidgetId;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java Thu Aug 9 07:05:51 2012
@@ -25,12 +25,12 @@ import java.util.List;
public class TagImpl implements Tag {
+ private String id;
private String keyword;
- private List<WidgetTag> widgets;
- public TagImpl(String keyword, List<WidgetTag> widgets) {
+ public TagImpl(String id, String keyword) {
+ this.id = id;
this.keyword = keyword;
- this.widgets = widgets;
}
public TagImpl(String keyword) {
@@ -41,6 +41,11 @@ public class TagImpl implements Tag {
}
@Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
public String getKeyword() {
return this.keyword;
}
@@ -49,14 +54,4 @@ public class TagImpl implements Tag {
public void setKeyword(String keyword) {
this.keyword = keyword;
}
-
- @Override
- public List<WidgetTag> getWidgets() {
- return this.widgets;
- }
-
- @Override
- public void setWidgets(List<WidgetTag> widgets) {
- this.widgets = widgets;
- }
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java Thu Aug 9 07:05:51 2012
@@ -31,7 +31,7 @@ import java.util.Date;
import java.util.List;
public class UserImpl extends PersonImpl implements User {
- private Long id;
+ private String id;
private String password;
private boolean expired;
private boolean credsExpired;
@@ -47,11 +47,11 @@ public class UserImpl extends PersonImpl
public UserImpl() {}
- public UserImpl(Long id) {
+ public UserImpl(String id) {
this.id = id;
}
- public UserImpl(Long userid, String username) {
+ public UserImpl(String userid, String username) {
this.id = userid;
this.username = username;
}
@@ -163,11 +163,11 @@ public class UserImpl extends PersonImpl
return p;
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java Thu Aug 9 07:05:51 2012
@@ -24,8 +24,8 @@ import org.apache.rave.portal.model.*;
import java.util.Date;
public class WidgetCommentImpl implements WidgetComment {
- private Long id;
- private Long widgetId;
+ private String id;
+ private String widgetId;
private User user;
private String text;
private Date lastModifiedDate;
@@ -33,27 +33,26 @@ public class WidgetCommentImpl implement
public WidgetCommentImpl() {}
- public WidgetCommentImpl(Long id) {
+ public WidgetCommentImpl(String id) {
this.id = id;
}
@Override
- public Long getId() {
+ public String getId() {
return id;
}
- @Override
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
@Override
- public Long getWidgetId() {
+ public String getWidgetId() {
return widgetId;
}
@Override
- public void setWidgetId(Long widgetId) {
+ public void setWidgetId(String widgetId) {
this.widgetId = widgetId;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java Thu Aug 9 07:05:51 2012
@@ -23,7 +23,7 @@ import org.apache.rave.portal.model.*;
import java.util.List;
public class WidgetImpl implements Widget {
- private Long id;
+ private String id;
private String title;
private String titleUrl;
private String url;
@@ -45,20 +45,20 @@ public class WidgetImpl implements Widge
public WidgetImpl() {}
- public WidgetImpl(long id) {
+ public WidgetImpl(String id) {
this.id = id;
}
- public WidgetImpl(long id, String url) {
+ public WidgetImpl(String id, String url) {
this.id = id;
this.url = url;
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java Thu Aug 9 07:05:51 2012
@@ -22,42 +22,46 @@ import org.apache.rave.portal.model.Widg
public class WidgetRatingImpl implements WidgetRating {
- private Long id;
- private Long widgetId;
- private Long userId;
+ private String id;
+ private String widgetId;
+ private String userId;
private Integer score;
public WidgetRatingImpl() {
}
- public WidgetRatingImpl(long id, long widgetId, long userId, int score) {
+ public WidgetRatingImpl(String id) {
+ this.id = id;
+ }
+
+ public WidgetRatingImpl(String id, String widgetId, String userId, int score) {
this.id = id;
this.widgetId = widgetId;
this.userId = userId;
this.score = score;
}
- public Long getId() {
+ public String getId() {
return id;
}
- public void setId(Long id) {
+ public void setId(String id) {
this.id = id;
}
- public Long getWidgetId() {
+ public String getWidgetId() {
return widgetId;
}
- public void setWidgetId(Long widgetId) {
+ public void setWidgetId(String widgetId) {
this.widgetId = widgetId;
}
- public Long getUserId() {
+ public String getUserId() {
return userId;
}
- public void setUserId(Long userId) {
+ public void setUserId(String userId) {
this.userId = userId;
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java Thu Aug 9 07:05:51 2012
@@ -26,39 +26,49 @@ import java.util.Date;
public class WidgetTagImpl implements WidgetTag {
- private Long widgetId;
- private User user;
+ private String id;
+ private String userId;
+ private String widgetId;
private Tag tag;
private Date createdDate;
- public WidgetTagImpl() {
+ public WidgetTagImpl(String widgetId) {
+ this.widgetId = widgetId;
+ }
+
+ public WidgetTagImpl(String widgetId, String userId, Date createdDate, Tag tag) {
+ this.widgetId = widgetId;
+ this.userId = userId;
+ this.tag = tag;
+ this.createdDate = createdDate;
}
- public WidgetTagImpl(Long widgetId, User user, Date createdDate, Tag tag) {
+ public WidgetTagImpl(String id, String widgetId, String userId, Date createdDate, Tag tag) {
+ this.id = id;
this.widgetId = widgetId;
- this.user = user;
+ this.userId = userId;
this.tag = tag;
this.createdDate = createdDate;
}
@Override
- public Long getWidgetId() {
- return this.widgetId;
+ public String getId() {
+ return this.id;
}
@Override
- public void setWidgetId(Long id) {
- this.widgetId = id;
+ public String getWidgetId() {
+ return widgetId;
}
@Override
- public User getUser() {
- return this.user;
+ public String getUserId() {
+ return this.userId;
}
@Override
- public void setUser(User user) {
- this.user = user;
+ public void setUserId(String userId) {
+ this.userId = userId;
}
@Override
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/ModelUtils.java Thu Aug 9 07:05:51 2012
@@ -37,13 +37,13 @@ public class ModelUtils {
public static final String STANDARD_DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZ";
- public static void normalizeRegionWidgetPreferences(long regionWidgetId, List<RegionWidgetPreference> preferences) {
+ public static void normalizeRegionWidgetPreferences(String regionWidgetId, List<RegionWidgetPreference> preferences) {
for (RegionWidgetPreference preference : preferences) {
normalizeRegionWidgetPreference(regionWidgetId, preference);
}
}
- public static void normalizeRegionWidgetPreference(long regionWidgetId, RegionWidgetPreference regionWidgetPreference) {
+ public static void normalizeRegionWidgetPreference(String regionWidgetId, RegionWidgetPreference regionWidgetPreference) {
regionWidgetPreference.setRegionWidgetId(regionWidgetId);
}
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/CategoryRepository.java Thu Aug 9 07:05:51 2012
@@ -34,5 +34,5 @@ public interface CategoryRepository exte
* @param userId
* @return the number of Categories modified
*/
- int removeFromCreatedOrModifiedFields(long userId);
+ int removeFromCreatedOrModifiedFields(String userId);
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java Thu Aug 9 07:05:51 2012
@@ -34,7 +34,7 @@ public interface PageRepository extends
* @param pageType the pageType to search by
* @return a list of all the Page objects owned by userId of type pageType
*/
- List<Page> getAllPages(Long userId, PageType pageType);
+ List<Page> getAllPages(String userId, PageType pageType);
/**
* Delete all pages for a userId of the supplied pageType
@@ -42,7 +42,7 @@ public interface PageRepository extends
* @param pageType
* @return the number of pages deleted
*/
- int deletePages(Long userId, PageType pageType);
+ int deletePages(String userId, PageType pageType);
/**
* Create either a Person or User Page from PageTemplate for the given user
@@ -58,7 +58,7 @@ public interface PageRepository extends
* @param userId
* @return boolean
*/
- boolean hasPersonPage(long userId);
+ boolean hasPersonPage(String userId);
/**
* Returns a list of pageUser records of a certain pageType.
@@ -67,7 +67,7 @@ public interface PageRepository extends
* @param pageType
* @return a list of pageUser
*/
- public List<PageUser> getPagesForUser(Long userId, PageType pageType);
+ public List<PageUser> getPagesForUser(String userId, PageType pageType);
/**
@@ -76,5 +76,5 @@ public interface PageRepository extends
* @param pageId
* @return a single pageUser
*/
- public PageUser getSingleRecord(Long userId, Long pageId);
+ public PageUser getSingleRecord(String userId, String pageId);
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java Thu Aug 9 07:05:51 2012
@@ -50,5 +50,5 @@ public interface TagRepository extends R
* @return a List of all tag not link to this widget{@link org.apache.rave.portal.model.Tag}'s.
*/
- List<Tag> getAvailableTagsByWidgetId(Long widgetId);
+ List<Tag> getAvailableTagsByWidgetId(String widgetId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java Thu Aug 9 07:05:51 2012
@@ -79,7 +79,7 @@ public interface UserRepository extends
* @param widgetId the entityId of the Widget to search
* @return List of User objects in alphabetical order sorted by familyname, givenname
*/
- List<User> getAllByAddedWidget(long widgetId);
+ List<User> getAllByAddedWidget(String widgetId);
/**
* Gets a {@link org.apache.rave.portal.model.User} by generated forgot email hash
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetCommentRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetCommentRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetCommentRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetCommentRepository.java Thu Aug 9 07:05:51 2012
@@ -25,5 +25,5 @@ public interface WidgetCommentRepository
* @param userId
* @return count of comments deleted
*/
- int deleteAll(Long userId);
+ int deleteAll(String userId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java Thu Aug 9 07:05:51 2012
@@ -31,7 +31,7 @@ public interface WidgetRatingRepository
* @param userId unique identifier of a User
* @return {@link org.apache.rave.portal.model.WidgetRating} if it exists, otherwise {@literal null}
*/
- WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId);
+ WidgetRating getByWidgetIdAndUserId(String widgetId, String userId);
/**
* Delete all Widget Ratings for a userId
@@ -39,5 +39,5 @@ public interface WidgetRatingRepository
* @param userId
* @return count of ratings deleted
*/
- int deleteAll(Long userId);
+ int deleteAll(String userId);
}