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/26 20:19:38 UTC

svn commit: r1354148 [1/9] - in /rave/trunk: ./ rave-components/ rave-components/rave-commons/ rave-components/rave-commons/src/main/java/org/apache/rave/model/ rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/ rave-components...

Author: mfranklin
Date: Tue Jun 26 18:18:57 2012
New Revision: 1354148

URL: http://svn.apache.org/viewvc?rev=1354148&view=rev
Log:
Reintegrated model_interfaces branch into trunk (RAVE-628)

Added:
    rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/model/ModelConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-commons/src/main/java/org/apache/rave/model/ModelConverter.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Address.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Address.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ApplicationData.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Authority.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Group.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthConsumerStore.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/OAuthTokenInfo.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Organization.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Organization.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Page.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageLayout.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplate.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateRegion.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageUser.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Person.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Person.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonProperty.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PortalPreference.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Region.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidgetPreference.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/User.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Widget.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetComment.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetRating.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AddressImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ApplicationDataImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/AuthorityImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/GroupImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthConsumerStoreImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OAuthTokenInfoImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/OrganizationImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageLayoutImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateRegionImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageTemplateWidgetImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PersonPropertyImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PortalPreferenceImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetPreferenceImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/TagImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetCommentImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ApplicationDataRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthConsumerStoreRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/OAuthTokenInfoRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PersonRepository.java
    rave/trunk/rave-components/rave-jpa/   (props changed)
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/
    rave/trunk/rave-components/rave-jpa/pom.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/pom.xml
    rave/trunk/rave-components/rave-jpa/src/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/
    rave/trunk/rave-components/rave-jpa/src/main/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/
    rave/trunk/rave-components/rave-jpa/src/main/java/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAddress.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAddress.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaApplicationData.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaApplicationData.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaAuthority.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaCategory.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaGroup.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthConsumerStore.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthConsumerStore.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthTokenInfo.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOAuthTokenInfo.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaOrganization.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPage.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageLayout.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageLayout.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplate.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateRegion.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageTemplateWidget.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPageUser.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPerson.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPersonProperty.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaPortalPreference.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegion.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidget.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaRegionWidgetPreference.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaTag.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaUser.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidget.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetComment.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetRating.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaWidgetTag.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactory.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAddressConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaGroupConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageLayoutConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageLayoutConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageUserConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaTagConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaUserConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverter.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaCategoryRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPersonRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaTagRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaUserRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepository.java
    rave/trunk/rave-components/rave-jpa/src/main/resources/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/
    rave/trunk/rave-components/rave-jpa/src/main/resources/META-INF/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/META-INF/
    rave/trunk/rave-components/rave-jpa/src/main/resources/META-INF/persistence.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/META-INF/persistence.xml
    rave/trunk/rave-components/rave-jpa/src/main/resources/org/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/
    rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/
    rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/
    rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
    rave/trunk/rave-components/rave-jpa/src/test/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/
    rave/trunk/rave-components/rave-jpa/src/test/java/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PageTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/TagTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/UserTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/UserTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/WidgetTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/ConvertingListProxyFactoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAddressConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaApplicationDataConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaAuthorityConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaGroupConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthConsumerStoreConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPersonPropertyConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaPortalPreferenceConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaRegionWidgetPreferenceConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaTagConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaUserConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetTagConverterTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/RepositoryTestUtils.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/RepositoryTestUtils.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaApplicationDataRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaAuthorityRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaCategoryRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthConsumerStoreRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaOAuthTokenInfoRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageLayoutRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPersonRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaPortalPreferenceRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaRegionWidgetRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaTagRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaUserRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetCommentRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRatingRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/repository/impl/JpaWidgetTagRepositoryTest.java
    rave/trunk/rave-components/rave-jpa/src/test/resources/
      - copied from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/
    rave/trunk/rave-components/rave-jpa/src/test/resources/log4j.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/log4j.xml
    rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/portal.properties
    rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
    rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test-dataContext.xml
    rave/trunk/rave-components/rave-jpa/src/test/resources/test_data.sql
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-jpa/src/test/resources/test_data.sql
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/ModelUtils.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/MaterializedBeanObjectMapperFactory.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/UserForm.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/conversion/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/impl/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/model/conversion/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/model/impl/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/model/impl/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/OpenSocialPersonRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java
      - copied unchanged from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/DecoratingOpenSocialPersonRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/model/conversion/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/model/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/model/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/model/conversion/
      - copied from r1354136, rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/model/conversion/
Removed:
    rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/AbstractJpaRepository.java
    rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/persistence/jpa/AbstractJpaRepositoryTest.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/
    rave/trunk/rave-components/rave-core/src/main/resources/META-INF/
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/AuthorityTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PageTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/PortalPreferenceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/TagTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/UserTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetCommentTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetRatingTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTagTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/WidgetTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/repository/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthConsumerStore.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/model/OAuthTokenInfo.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthConsumerStoreRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/OAuthTokenInfoRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthConsumerStoreRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/repository/impl/JpaOAuthTokenInfoRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/model/ApplicationData.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/ApplicationDataRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/PersonRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/JpaApplicationDataRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/repository/impl/JpaPersonRepository.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthConsumerStoreRepositoryTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/repository/JpaOAuthTokenInfoRepositoryTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/repository/JpaApplicationDataRepositoryTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/repository/JpaPersonRepositoryTest.java
Modified:
    rave/trunk/   (props changed)
    rave/trunk/pom.xml
    rave/trunk/rave-components/pom.xml
    rave/trunk/rave-components/rave-commons/pom.xml
    rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java
    rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/util/CollectionUtils.java
    rave/trunk/rave-components/rave-commons/src/test/java/org/apache/rave/util/CollectionUtilsTest.java
    rave/trunk/rave-components/rave-core/pom.xml
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Category.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/Tag.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/WidgetTag.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/util/SearchResult.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/AuthorityRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PortalPreferenceRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/TagRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRatingRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/RavePermissionEvaluator.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
    rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java
    rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/RavePermissionEvaluatorTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultAuthorityServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultNewAccountServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageLayoutServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultTagServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultUserServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultWidgetTagServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/web/renderer/RenderServiceTest.java
    rave/trunk/rave-components/rave-core/src/test/resources/test_data.sql
    rave/trunk/rave-components/rave-web/pom.xml
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rest/WidgetApi.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/api/rpc/PageApi.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ChangePasswordController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/MessageBundleController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/NewAccountController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/PageController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ProfileController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/ReminderController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/UserProfileController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/WidgetStoreController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/CategoryController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/UserController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/admin/WidgetController.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/controller/util/CategoryEditor.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapper.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/ChangePasswordValidator.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewAccountValidator.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/NewWidgetValidator.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UpdateWidgetValidator.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/UserProfileValidator.java
    rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/validator/WidgetValidator.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/PageApiTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/RegionWidgetApiTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rest/WidgetApiTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/api/rpc/PageApiTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ChangePasswordControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/NewAccountControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/PageControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ProfileControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/ReminderControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/WidgetStoreControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/CategoryControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/PortalPreferenceControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/UserControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/admin/WidgetControllerTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/controller/util/CategoryEditorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/model/PortalPreferenceFormTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/security/LdapUserDetailsContextMapperTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/tag/RegionWidgetTagTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewAccountValidatorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/NewWidgetValidatorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/PortalPreferenceFormValidatorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UpdateWidgetValidatorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/UserProfileValidatorTest.java
    rave/trunk/rave-components/rave-web/src/test/java/org/apache/rave/portal/web/validator/WidgetValidatorTest.java
    rave/trunk/rave-demo-gadgets/pom.xml
    rave/trunk/rave-portal-dependencies/pom.xml
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferences.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/userdetail.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgets.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/userProfile.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/password_reminder.ftl
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/username_reminder.ftl
    rave/trunk/rave-portal/src/main/dist/LICENSE
    rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java
    rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/   (props changed)
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/EncryptedBlobSecurityTokenService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/service/impl/OpenSocialWidgetMetadataResolver.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/service/SecurityTokenServiceTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/   (props changed)
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/pom.xml
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStore.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthConsumerStoreService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/OAuthTokenInfoService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthConsumerStoreService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/gadgets/oauth/service/impl/DefaultOAuthTokenInfoService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultAppDataService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultPersonService.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/FieldRestrictingPerson.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/inject/DefaultOAuthStoreTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthConsumerStoreServiceTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/gadgets/oauth/service/DefaultOAuthTokenInfoServiceTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/inject/SpringBindingModuleTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/AppDataServiceTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/FieldRestrictingPersonTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/PersonServiceTest.java
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/   (props changed)
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
    rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
    rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/W3CWidget.java
    rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
    rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
    rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetMetadataResolverTest.java
    rave/trunk/rave-providers/rave-w3c-provider/src/test/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRendererTest.java

Propchange: rave/trunk/
------------------------------------------------------------------------------
  Merged /rave/branches/model_interfaces:r1343807-1354136

Modified: rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Tue Jun 26 18:18:57 2012
@@ -59,8 +59,8 @@
         <commons-codec.version>1.4</commons-codec.version>
         <icu4j.version>4.8.1.1</icu4j.version>
         <easymock.version>3.0</easymock.version>
-        <com.h2database.version>1.3.154</com.h2database.version>
-        <openjpa.version>2.1.1</openjpa.version>
+        <com.h2database.version>1.3.167</com.h2database.version>
+        <openjpa.version>2.2.0</openjpa.version>
         <org.openid4java.version>0.9.6</org.openid4java.version>
         <jersey-server.version>1.6</jersey-server.version>
         <jersey-spring.version>1.0</jersey-spring.version>
@@ -79,6 +79,8 @@
         <!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin configuration with
             $mvn filesync:generate -Dmaven.filesync.override=true -->
         <maven.filesync.override>false</maven.filesync.override>
+        <jackson.version>1.8.1</jackson.version>
+
 
         <!-- default empty javaagent
         if needed you can specify it on the command line with -Djavaagent="..." -->
@@ -116,6 +118,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>
@@ -285,6 +292,11 @@
             </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-mrbean</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-persist</artifactId>
                 <version>${guice.version}</version>

Modified: rave/trunk/rave-components/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/pom.xml?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/pom.xml (original)
+++ rave/trunk/rave-components/pom.xml Tue Jun 26 18:18:57 2012
@@ -37,6 +37,7 @@
     <modules>
         <module>rave-commons</module>
         <module>rave-core</module>
+        <module>rave-jpa</module>
         <module>rave-web</module>
     </modules>
     

Modified: rave/trunk/rave-components/rave-commons/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/pom.xml?rev=1354148&r1=1354147&r2=1354148&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/pom.xml (original)
+++ rave/trunk/rave-components/rave-commons/pom.xml Tue Jun 26 18:18:57 2012
@@ -117,4 +117,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>