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 2013/01/03 19:48:51 UTC
svn commit: r1428544 [1/2] - in /rave/trunk: ./ rave-components/
rave-components/rave-core/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/
rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/
rave-compo...
Author: mfranklin
Date: Thu Jan 3 18:48:47 2013
New Revision: 1428544
URL: http://svn.apache.org/viewvc?rev=1428544&view=rev
Log:
Reintegrating MongoDB branch
Added:
rave/trunk/UPGRADING
- copied, changed from r1428516, rave/branches/mongo/UPGRADING
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/
- copied from r1428516, rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/marshaller-applicationContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-jpa/src/main/resources/org/apache/rave/marshaller-applicationContext.xml
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml
rave/trunk/rave-components/rave-mongodb/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/
rave/trunk/rave-components/rave-mongodb/pom.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/pom.xml
rave/trunk/rave-components/rave-mongodb/src/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/
rave/trunk/rave-components/rave-mongodb/src/main/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/
rave/trunk/rave-components/rave-mongodb/src/main/java/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/db/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/db/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbAuthority.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbCategory.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPage.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageLayout.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageLayout.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPageTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPersonAssociation.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPersonAssociation.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPortalPreference.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbPortalPreference.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbUser.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/MongoDbWidget.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/WidgetRatingsMapReduceResult.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/WidgetRatingsMapReduceResult.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/WidgetUsersMapReduceResult.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/WidgetUsersMapReduceResult.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/HydratingConverterFactory.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/HydratingConverterFactory.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/HydratingModelConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/HydratingModelConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/TagImplConverter.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/util/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/util/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/util/MongoDbModelUtil.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/util/MongoDbModelUtil.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoModelOperations.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoPageOperations.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoTagOperations.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoTagOperations.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoUserOperations.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoUserOperations.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoWidgetOperations.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/MongoWidgetOperations.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/StatisticsAggregator.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbTagRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbUserRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoModelTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoPageTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoTagTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoTagTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoUserTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoWidgetTemplate.java
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/
rave/trunk/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/util/CollectionNames.java
rave/trunk/rave-components/rave-mongodb/src/main/resources/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsMap.js
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsReduce.js
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetRatingsReduce.js
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersMap.js
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersReduce.js
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/WidgetUsersReduce.js
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/marshaller-applicationContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/marshaller-applicationContext.xml
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml
rave/trunk/rave-components/rave-mongodb/src/test/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/
rave/trunk/rave-components/rave-mongodb/src/test/java/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbAuthorityTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbCategoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageLayoutTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTemplateTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPageTemplateTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPersonAssociationTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbPortalPreferenceTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbUserTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/MongoDbWidgetTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongDbConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbAuthorityConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbCategoryConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPageTemplateConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbPortalPreferenceConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbUserConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverterTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverterTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbApplicationDataRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbAuthorityRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbCategoryRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOAuthTokenInfoRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbOauthConsumerStoreRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageLayoutRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPageTemplateRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPersonRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbPortalPreferenceRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbRegionWidgetRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbTagRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbUserRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetCommentRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRatingRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MongoDbWidgetTagRepositoryTest.java
rave/trunk/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/java/org/apache/rave/portal/repository/impl/MonogoDbMapReduceStatisticsAggregatorTest.java
rave/trunk/rave-components/rave-mongodb/src/test/resources/
- copied from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/resources/
rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/resources/portal.properties
rave/trunk/rave-components/rave-mongodb/src/test/resources/test-applicationContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-components/rave-mongodb/src/test/resources/test-applicationContext.xml
rave/trunk/rave-portal-resources/src/main/resources_jpa/
- copied from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/
rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/dataContext.xml
rave/trunk/rave-portal-resources/src/main/resources_jpa/db/
- copied from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/db/
rave/trunk/rave-portal-resources/src/main/resources_jpa/db/initial_data.sql
- copied unchanged from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_jpa/db/initial_data.sql
rave/trunk/rave-portal-resources/src/main/resources_mongo/
- copied from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/
rave/trunk/rave-portal-resources/src/main/resources_mongo/dataContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/dataContext.xml
rave/trunk/rave-portal-resources/src/main/resources_mongo/db/
- copied from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/db/
rave/trunk/rave-portal-resources/src/main/resources_mongo/db/initial-data.json
- copied unchanged from r1428516, rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/db/initial-data.json
rave/trunk/rave-portal/src/test/resources_jpa/
- copied from r1428516, rave/branches/mongo/rave-portal/src/test/resources_jpa/
rave/trunk/rave-portal/src/test/resources_jpa/test-data.sql
- copied unchanged from r1428516, rave/branches/mongo/rave-portal/src/test/resources_jpa/test-data.sql
rave/trunk/rave-portal/src/test/resources_jpa/test-dataContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-portal/src/test/resources_jpa/test-dataContext.xml
rave/trunk/rave-portal/src/test/resources_mongo/
- copied from r1428516, rave/branches/mongo/rave-portal/src/test/resources_mongo/
rave/trunk/rave-portal/src/test/resources_mongo/initial-data.json
- copied unchanged from r1428516, rave/branches/mongo/rave-portal/src/test/resources_mongo/initial-data.json
rave/trunk/rave-portal/src/test/resources_mongo/test-dataContext.xml
- copied unchanged from r1428516, rave/branches/mongo/rave-portal/src/test/resources_mongo/test-dataContext.xml
Removed:
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/
rave/trunk/rave-portal/src/test/resources/test-data.sql
rave/trunk/rave-portal/src/test/resources/test-dataContext.xml
Modified:
rave/trunk/ (props changed)
rave/trunk/pom.xml
rave/trunk/rave-components/pom.xml
rave/trunk/rave-components/rave-core/pom.xml
rave/trunk/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/PageUserImpl.java
rave/trunk/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
rave/trunk/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/WidgetRatingImpl.java
rave/trunk/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/PageTemplateRepository.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/resources/org/apache/rave/core-applicationContext.xml
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/resources/portal.properties
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties
rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
rave/trunk/rave-portal-dependencies/pom.xml
rave/trunk/rave-portal-resources/pom.xml
rave/trunk/rave-portal-resources/src/main/resources/portal.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
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/tags/navbar.tag
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_person_profile.js
rave/trunk/rave-portal/pom.xml
rave/trunk/rave-portal/src/test/resources/portal.properties
rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
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/web/renderer/OpenSocialWidgetRendererTest.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave.shindig.properties
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-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties
Propchange: rave/trunk/
------------------------------------------------------------------------------
Merged /rave/branches/mongo:r1397003-1428516
Copied: rave/trunk/UPGRADING (from r1428516, rave/branches/mongo/UPGRADING)
URL: http://svn.apache.org/viewvc/rave/trunk/UPGRADING?p2=rave/trunk/UPGRADING&p1=rave/branches/mongo/UPGRADING&r1=1428516&r2=1428544&rev=1428544&view=diff
==============================================================================
--- rave/branches/mongo/UPGRADING (original)
+++ rave/trunk/UPGRADING Thu Jan 3 18:48:47 2013
@@ -1,4 +1,4 @@
-Upgrading from 0.17 to 0.18
+Upgrading from Rave < 0.18 to 0.19
=======================================
- rave.shindig.properties & portal.properties keys have been changed for JPA operations. The prefix is now jpa.xxx.xxxx
- the MongoDB implementation has properties added to rave.shindig.properties and portal.properties
\ No newline at end of file
Modified: rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Thu Jan 3 18:48:47 2013
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -47,6 +48,7 @@
<org.springframework.version>3.2.0.RELEASE</org.springframework.version>
<org.springframework.security.version>3.1.3.RELEASE</org.springframework.security.version>
<org.springframework.mobile.version>1.0.1.RELEASE</org.springframework.mobile.version>
+ <org.springframework.data.mongodb.version>1.0.3.RELEASE</org.springframework.data.mongodb.version>
<jstl.version>1.2</jstl.version>
<javax.servlet.version>2.5</javax.servlet.version>
<jsp-api.version>2.1</jsp-api.version>
@@ -76,6 +78,8 @@
<javax.mail.version>1.4.5</javax.mail.version>
<javax.activation.version>1.1.1</javax.activation.version>
<freemarker.version>2.3.19</freemarker.version>
+ <org.mongodb.driver.version>2.9.1</org.mongodb.driver.version>
+ <de.flapdoodle.embed.mongo.version>1.28</de.flapdoodle.embed.mongo.version>
<!-- The location of Rave's H2 file DB. No trailing / -->
<rave.database.location>/tmp/rave_db</rave.database.location>
@@ -86,7 +90,8 @@
<cargo.version>1.3.1</cargo.version>
<!-- default empty javaagent
if needed you can specify it on the command line with -Djavaagent="..." -->
- <javaagent />
+ <javaagent/>
+ <maven-war-plugin.version>2.3</maven-war-plugin.version>
</properties>
<repositories>
@@ -120,6 +125,11 @@
</dependency>
<dependency>
<groupId>org.apache.rave</groupId>
+ <artifactId>rave-mongodb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rave</groupId>
<artifactId>rave-web</artifactId>
<version>${project.version}</version>
</dependency>
@@ -150,7 +160,7 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-demo-gadgets</artifactId>
<version>${project.version}</version>
@@ -204,9 +214,9 @@
<version>${org.springframework.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${org.springframework.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context-support</artifactId>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -280,9 +290,9 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-oxm</artifactId>
- <version>${org.springframework.version}</version>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-oxm</artifactId>
+ <version>${org.springframework.version}</version>
</dependency>
<dependency>
@@ -291,14 +301,25 @@
<version>${org.springframework.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.mobile</groupId>
- <artifactId>spring-mobile-device</artifactId>
- <version>${org.springframework.mobile.version}</version> <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.mobile</groupId>
+ <artifactId>spring-mobile-device</artifactId>
+ <version>${org.springframework.mobile.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-mongodb</artifactId>
+ <version>${org.springframework.data.mongodb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
@@ -335,6 +356,16 @@
<artifactId>h2</artifactId>
<version>${com.h2database.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ <version>${org.mongodb.driver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.flapdoodle.embed</groupId>
+ <artifactId>de.flapdoodle.embed.mongo</artifactId>
+ <version>${de.flapdoodle.embed.mongo.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -376,10 +407,10 @@
<version>${org.openid4java.version}</version>
<type>pom</type>
<exclusions>
- <exclusion>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -464,23 +495,23 @@
<version>${recaptcha4j.version}</version>
</dependency>
<!-- Mail-->
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${javax.activation.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
- </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>${javax.mail.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax.activation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
<!-- ApacheDS (LDAP) -->
<dependency>
@@ -496,7 +527,7 @@
</dependency>
- <!-- Test -->
+ <!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -573,7 +604,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.3</version>
+ <version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.googlecode.mavenfilesync</groupId>
@@ -593,7 +624,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>${cobertura.version}</version>
+ <version>${cobertura.version}</version>
<configuration>
<formats>
<format>html</format>
@@ -619,7 +650,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
<pluginExecution>
@@ -632,7 +663,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
<pluginExecution>
@@ -645,7 +676,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
<pluginExecution>
@@ -659,7 +690,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -702,6 +733,15 @@
</modules>
<profiles>
<profile>
+ <id>jpa</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>mongodb</id>
+ </profile>
+ <profile>
<id>apache-release</id>
<build>
<plugins>
Modified: rave/trunk/rave-components/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/pom.xml?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/pom.xml (original)
+++ rave/trunk/rave-components/pom.xml Thu Jan 3 18:48:47 2013
@@ -38,6 +38,7 @@
<module>rave-commons</module>
<module>rave-core</module>
<module>rave-jpa</module>
+ <module>rave-mongodb</module>
<module>rave-web</module>
</modules>
Modified: rave/trunk/rave-components/rave-core/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/pom.xml?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/pom.xml (original)
+++ rave/trunk/rave-components/rave-core/pom.xml Thu Jan 3 18:48:47 2013
@@ -89,6 +89,12 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mrbean</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- JSON Support -->
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/CategoryImpl.java Thu Jan 3 18:48:47 2013
@@ -40,6 +40,11 @@ public class CategoryImpl implements Cat
this.id = id;
}
+ public CategoryImpl(String id, String text) {
+ this.id=id;
+ this.text = text;
+ }
+
@Override
public String getId() {
return id;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/PageUserImpl.java Thu Jan 3 18:48:47 2013
@@ -19,15 +19,18 @@
package org.apache.rave.portal.model.impl;
import org.apache.rave.portal.model.*;
+import org.codehaus.jackson.annotate.JsonBackReference;
public class PageUserImpl implements PageUser {
private String id;
private String userId;
- private Page page;
private boolean editor;
private Long renderSequence;
private PageInvitationStatus pageStatus;
+ @JsonBackReference
+ private Page page;
+
public PageUserImpl(){}
public PageUserImpl(String id){
@@ -104,4 +107,33 @@ public class PageUserImpl implements Pag
public void setPageStatus(PageInvitationStatus pageStatus) {
this.pageStatus = pageStatus;
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof PageUserImpl)) return false;
+
+ PageUserImpl pageUser = (PageUserImpl) o;
+
+ if (editor != pageUser.editor) return false;
+ if (id != null ? !id.equals(pageUser.id) : pageUser.id != null) return false;
+ if (page != null ? !page.equals(pageUser.page) : pageUser.page != null) return false;
+ if (pageStatus != pageUser.pageStatus) return false;
+ if (renderSequence != null ? !renderSequence.equals(pageUser.renderSequence) : pageUser.renderSequence != null)
+ return false;
+ if (userId != null ? !userId.equals(pageUser.userId) : pageUser.userId != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id != null ? id.hashCode() : 0;
+ result = 31 * result + (userId != null ? userId.hashCode() : 0);
+ result = 31 * result + (editor ? 1 : 0);
+ result = 31 * result + (renderSequence != null ? renderSequence.hashCode() : 0);
+ result = 31 * result + (pageStatus != null ? pageStatus.hashCode() : 0);
+ result = 31 * result + (page != null ? page.hashCode() : 0);
+ return result;
+ }
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionImpl.java Thu Jan 3 18:48:47 2013
@@ -21,6 +21,7 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
+import org.codehaus.jackson.annotate.JsonBackReference;
import java.util.List;
@@ -55,6 +56,7 @@ public class RegionImpl implements Regio
}
@Override
+ @JsonBackReference
public Page getPage() {
return page;
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/RegionWidgetImpl.java Thu Jan 3 18:48:47 2013
@@ -21,14 +21,13 @@ package org.apache.rave.portal.model.imp
import org.apache.rave.portal.model.Region;
import org.apache.rave.portal.model.RegionWidget;
import org.apache.rave.portal.model.RegionWidgetPreference;
-import org.apache.rave.portal.model.Widget;
+import org.codehaus.jackson.annotate.JsonBackReference;
import java.util.List;
public class RegionWidgetImpl implements RegionWidget {
private String id;
private String widgetId;
- private Region region;
private String renderPosition;
private Integer renderOrder = 0;
private Boolean collapsed = false;
@@ -36,6 +35,9 @@ public class RegionWidgetImpl implements
private Boolean locked = false;
private Boolean hideChrome = false;
+ @JsonBackReference
+ private Region region;
+
public RegionWidgetImpl() {
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/UserImpl.java Thu Jan 3 18:48:47 2013
@@ -146,6 +146,7 @@ public class UserImpl extends PersonImpl
public Person toPerson() {
PersonImpl p = new PersonImpl();
+ p.setId(this.getId());
p.setAboutMe(this.getAboutMe());
p.setAdditionalName(this.getAdditionalName());
p.setAddresses(this.getAddresses());
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetRatingImpl.java Thu Jan 3 18:48:47 2013
@@ -23,7 +23,6 @@ import org.apache.rave.portal.model.Widg
public class WidgetRatingImpl implements WidgetRating {
private String id;
- private String widgetId;
private String userId;
private Integer score;
@@ -34,7 +33,7 @@ public class WidgetRatingImpl implements
this.id = id;
}
- public WidgetRatingImpl(String id, String userId, int score) {
+ public WidgetRatingImpl(String id, String userId, Integer score) {
this.id = id;
this.userId = userId;
this.score = score;
@@ -74,7 +73,6 @@ public class WidgetRatingImpl implements
if (id != null ? !id.equals(that.id) : that.id != null) return false;
if (score != null ? !score.equals(that.score) : that.score != null) return false;
if (userId != null ? !userId.equals(that.userId) : that.userId != null) return false;
- if (widgetId != null ? !widgetId.equals(that.widgetId) : that.widgetId != null) return false;
return true;
}
@@ -82,7 +80,6 @@ public class WidgetRatingImpl implements
@Override
public int hashCode() {
int result = id != null ? id.hashCode() : 0;
- result = 31 * result + (widgetId != null ? widgetId.hashCode() : 0);
result = 31 * result + (userId != null ? userId.hashCode() : 0);
result = 31 * result + (score != null ? score.hashCode() : 0);
return result;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/WidgetTagImpl.java Thu Jan 3 18:48:47 2013
@@ -30,6 +30,9 @@ public class WidgetTagImpl implements Wi
private String tagId;
private Date createdDate;
+ public WidgetTagImpl() {
+ }
+
public WidgetTagImpl(User user, Date createdDate, Tag tag) {
this.userId = user.getId();
this.tagId = tag.getId();
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/PageTemplateRepository.java Thu Jan 3 18:48:47 2013
@@ -27,4 +27,5 @@ public interface PageTemplateRepository
List<PageTemplate> getAll();
PageTemplate getDefaultPage(PageType pageType);
+ PageTemplate save(PageTemplate template);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Thu Jan 3 18:48:47 2013
@@ -206,7 +206,7 @@ public class DefaultPageService implemen
RegionWidget regionWidget = regionWidgetRepository.get(regionWidgetId);
verifyRegionWidgetIsNotLocked(regionWidget);
verifyRegionIsNotLocked(target);
- if (toRegionId == fromRegionId) {
+ if (toRegionId.equals(fromRegionId)) {
moveWithinRegion(regionWidgetId, newPosition, target);
} else {
moveBetweenRegions(regionWidgetId, newPosition, fromRegionId, target);
@@ -223,6 +223,8 @@ public class DefaultPageService implemen
// Get the region widget
RegionWidget regionWidget = getFromRepository(regionWidgetId, regionWidgetRepository);
+ Region moveFromRegion = regionWidget.getRegion();
+
// Move it to first position of the first region
Region moveToRegion = toPage.getRegions().get(0);
@@ -233,10 +235,14 @@ public class DefaultPageService implemen
regionWidget.setRenderOrder(0);
regionWidget.setRegion(moveToRegion);
moveToRegion.getRegionWidgets().add(0, regionWidget);
+ //remove it from the old region
+ moveFromRegion.getRegionWidgets().remove(regionWidget);
// update the rendersequences of the widgets in this region
updateRenderSequences(moveToRegion.getRegionWidgets());
+ updateRenderSequences(moveFromRegion.getRegionWidgets());
// persist it
regionRepository.save(moveToRegion);
+ regionRepository.save(moveFromRegion);
return getFromRepository(regionWidgetId, regionWidgetRepository);
}
@@ -318,7 +324,6 @@ public class DefaultPageService implemen
@Transactional
public Boolean clonePageForUser(String pageId, String userId, String pageName) {
- Widget widget = null;
Page page = getPage(pageId);
if(pageName == null || pageName.equals("null")){
// try to use the original page name if none supplied
@@ -329,10 +334,10 @@ public class DefaultPageService implemen
for(int i=0; i<page.getRegions().size(); i++){
for(int j=0; j<page.getRegions().get(i).getRegionWidgets().size(); j++){
String widgetId = page.getRegions().get(i).getRegionWidgets().get(j).getWidgetId();
- widget = widgetRepository.get(widgetId);
- addWidgetToPageRegion(clonedPage.getId(), widget.getId(), clonedPage.getRegions().get(i).getId());
+ addWidgetToPageRegion(clonedPage.getId(), widgetId, clonedPage.getRegions().get(i).getId());
}
}
+ clonedPage = getFromRepository(clonedPage.getId(), pageRepository);
// newly created page - so only one pageUser
PageUser pageUser = clonedPage.getMembers().get(0);
// update status to pending
Modified: rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml (original)
+++ rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml Thu Jan 3 18:48:47 2013
@@ -50,13 +50,6 @@
<context:component-scan base-package="org.apache.rave.portal.service"/>
<context:component-scan base-package="org.apache.rave.portal.security"/>
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="url" value="${portal.dataSource.url}"/>
- <property name="driverClassName" value="${portal.dataSource.driver}"/>
- <property name="username" value="${portal.dataSource.username}"/>
- <property name="password" value="${portal.dataSource.password}"/>
- </bean>
-
<!-- Password encoding -->
<bean class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" id="passwordEncoder">
<!--<constructor-arg index="0" value="10"/>-->
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java Thu Jan 3 18:48:47 2013
@@ -19,6 +19,7 @@
package org.apache.rave.portal.service.impl;
+import com.google.common.collect.Lists;
import org.apache.rave.portal.model.Page;
import org.apache.rave.portal.model.PageLayout;
import org.apache.rave.portal.model.PageTemplate;
@@ -1307,21 +1308,25 @@ public class DefaultPageServiceTest {
Region region = new RegionImpl();
region.setLocked(false);
+ region.setRegionWidgets(Lists.<RegionWidget>newArrayList());
RegionWidget regionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
regionWidget.setRegion(region);
+ region.getRegionWidgets().add(regionWidget);
expect(pageRepository.get(TO_PAGE_ID)).andReturn(toPageValue);
expect(regionWidgetRepository.get(WIDGET_ID)).andReturn(regionWidget).times(2);
+ expect(regionRepository.save(originalRegion)).andReturn(originalRegion);
+ expect(regionRepository.save(region)).andReturn(region);
- replay(pageRepository);
- replay(regionWidgetRepository);
+ replay(pageRepository, regionWidgetRepository, regionRepository);
RegionWidget updatedRegionWidget = pageService.moveRegionWidgetToPage(VALID_REGION_WIDGET_ID, TO_PAGE_ID);
verify(pageRepository);
verify(regionWidgetRepository);
verifyPositions(0, regionWidget, true);
+ assertThat(region.getRegionWidgets().isEmpty(), is(true));
}
Modified: rave/trunk/rave-components/rave-core/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-components/rave-core/src/test/resources/portal.properties Thu Jan 3 18:48:47 2013
@@ -21,21 +21,21 @@
portal.page.default_name=Main
#Default Rave Portal database settings with in memory H2 database
-portal.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
-portal.dataSource.driver=org.h2.Driver
-portal.dataSource.username=sa
-portal.dataSource.password=local
-
-portal.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
-portal.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
-portal.jpaVendorAdapter.database=H2
+jpa.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
+jpa.dataSource.driver=org.h2.Driver
+jpa.dataSource.username=sa
+jpa.dataSource.password=local
+
+jpa.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
+jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
+jpa.jpaVendorAdapter.database=H2
# General Rave portal database settings
-portal.jpaVendorAdapter.showSql=true
-portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
-portal.openjpa.RuntimeUnenhancedClasses=supported
-portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
-portal.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict
+jpa.jpaVendorAdapter.showSql=true
+jpa.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
+jpa.openjpa.RuntimeUnenhancedClasses=supported
+jpa.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+jpa.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
provider.wookie.wookieApiKey=TEST
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaPageTemplateRepository.java Thu Jan 3 18:48:47 2013
@@ -21,6 +21,7 @@ package org.apache.rave.portal.repositor
import org.apache.rave.portal.model.JpaPageTemplate;
import org.apache.rave.portal.model.PageTemplate;
import org.apache.rave.portal.model.PageType;
+import org.apache.rave.portal.model.conversion.JpaConverter;
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.util.CollectionUtils;
import org.springframework.stereotype.Repository;
@@ -30,6 +31,8 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import java.util.List;
+import static org.apache.rave.persistence.jpa.util.JpaUtil.saveOrUpdate;
+
@Repository
public class JpaPageTemplateRepository implements PageTemplateRepository {
@@ -48,4 +51,9 @@ public class JpaPageTemplateRepository i
query.setParameter("pageType", pageType);
return query.getSingleResult();
}
+
+ @Override
+ public PageTemplate save(PageTemplate template) {
+ return (PageTemplate) saveOrUpdate(template.getId(), manager, JpaConverter.getInstance().convert(template, PageTemplate.class));
+ }
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/portal.properties Thu Jan 3 18:48:47 2013
@@ -20,22 +20,23 @@
# the default page name to create for new users
portal.page.default_name=Main
+
#Default Rave Portal database settings with in memory H2 database
-portal.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
-portal.dataSource.driver=org.h2.Driver
-portal.dataSource.username=sa
-portal.dataSource.password=local
-
-portal.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
-portal.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
-portal.jpaVendorAdapter.database=H2
-
-# General Rave portal database settings
-portal.jpaVendorAdapter.showSql=true
-portal.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
-portal.openjpa.RuntimeUnenhancedClasses=supported
-portal.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
-portal.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict
+jpa.dataSource.url=jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1
+jpa.dataSource.driver=org.h2.Driver
+jpa.dataSource.username=sa
+jpa.dataSource.password=local
+
+jpa.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect
+jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary
+jpa.jpaVendorAdapter.database=H2
+
+# General Rave jpa database settings
+jpa.jpaVendorAdapter.showSql=true
+jpa.openjpa.Log=DefaultLevel=WARN, Runtime=INFO, Tool=INFO, SQL=WARN
+jpa.openjpa.RuntimeUnenhancedClasses=unsupported
+jpa.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true)
+jpa.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
provider.wookie.wookieApiKey=TEST
Modified: rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml (original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml Thu Jan 3 18:48:47 2013
@@ -19,9 +19,129 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:context="http://www.springframework.org/schema/context"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
- <import resource="classpath:org/apache/rave/jpa-applicationContext.xml"/>
+
+ <!-- make the the portal.properties props available to autowire injectors, location of the properties can
+be overridden by setting a system property "portal.override.properties" -->
+ <bean id="portalPropertyPlaceholder" class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
+ <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+ <property name="systemPropertyName" value="portal.override.properties"/>
+ <property name="location" value="classpath:portal.properties"/>
+ </bean>
+
+ <!-- bean post-processor for JPA annotations -->
+ <context:annotation-config/>
+
+ <!-- enable the use of the @AspectJ style of Spring AOP -->
+ <aop:aspectj-autoproxy/>
+
+ <!-- rave-common component base-package scan (maybe move to a separate common-applicationContext.xml?) -->
+ <context:component-scan base-package="org.apache.rave.service"/>
+ <context:component-scan base-package="org.apache.rave.synchronization"/>
+
+ <!-- rave-core component base-package scan -->
+ <context:component-scan base-package="org.apache.rave.portal.model"/>
+ <context:component-scan base-package="org.apache.rave.portal.repository"/>
+
+ <!-- Password encoding -->
+ <bean class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" id="passwordEncoder">
+ <!--<constructor-arg index="0" value="10"/>-->
+ </bean>
+
+ <!-- email settings -->
+ <bean id="emailServiceMailMessage" class="org.springframework.mail.SimpleMailMessage">
+ <property name="from" value="${portal.mail.sender}"/>
+ <property name="replyTo" value="${portal.mail.replyto}"/>
+ </bean>
+
+ <bean id="freemarkerMailConfiguration" class="org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean">
+ <property name="templateLoaderPath" value="/WEB-INF/mailtemplates"/>
+ </bean>
+ <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+ <property name="host" value="${portal.mail.host}"/>
+ <property name="password" value="${portal.mail.password}"/>
+ <property name="username" value="${portal.mail.username}"/>
+ <property name="port" value="${portal.mail.port}"/>
+ <property name="protocol" value="${portal.mail.protocol}"/>
+ <!-- NOTE: if using Gmail, you'll need following properties-->
+ <!--<property name="javaMailProperties">
+ <props>
+ <prop key="mail.smtp.auth">true</prop>
+ <prop key="mail.smtp.starttls.enable">true</prop>
+ <prop key="mail.smtp.timeout">8500</prop>
+ </props>
+ </property>-->
+ </bean>
+ <!--
+ NOTE: to use mail session you'll need to configure following within catalina_home/conf/context.xml
+ <Resource name="mail/Session" auth="Container" type="javax.mail.Session" mail.smtp.host="my.mail.host"/>
+
+ Further, activation & mail jars needs to be placed within catalina_home/lib folder
+ -->
+ <!--
+ <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+ <property name="session" ref="mailSession"/>
+ </bean>
+ <bean id="mailSession" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/mail/Session"/>
+ </bean>
+ -->
+
+ <bean id="restTemplate" class="org.springframework.web.client.RestTemplate" />
+
+ <bean id="staticContentCache" class="org.apache.rave.service.impl.DefaultStaticContentFetcherService">
+ <constructor-arg ref="restTemplate"/>
+ <constructor-arg>
+ <list>
+ <!-- example of a Static Content source that doesn't have any string token placeholders in its content body
+ <bean class="org.apache.rave.model.StaticContent">
+ <constructor-arg index="0" value="standardCompanyHeader"/>
+ <constructor-arg index="1" value="${company.header.host}/content/standard_header.html"/>
+ <constructor-arg index="2">
+ <null/>
+ </constructor-arg>
+ </bean>
+ -->
+ <!-- example of a Static Content source that has string token placeholders
+ <bean class="org.apache.rave.model.StaticContent">
+ <constructor-arg index="0" value="environmentSpecificContent"/>
+ <constructor-arg index="1" value="${company.header.host}/content/footer.html"/>
+ <constructor-arg index="2">
+ <map>
+ <entry key="\{supportEmail\}" value="${raveproperty.supportemail}"/>
+ <entry key="\{productVersion\}" value="${raveproperty.version}"/>
+ </map>
+ </constructor-arg>
+ </bean>
+ -->
+ </list>
+ </constructor-arg>
+ </bean>
+
+ <!-- example on how to setup a Spring Timer to refresh the Static Content cache at a fixed interval
+ <bean id="refreshStaticContentCacheScheduledTask" class="org.springframework.scheduling.timer.ScheduledTimerTask">
+ <property name="delay" value="5000"/>
+ <property name="period" value="300000"/>
+ <property name="timerTask">
+ <bean class="org.springframework.scheduling.timer.MethodInvokingTimerTaskFactoryBean"
+ p:targetObject-ref="staticContentCache" p:targetMethod="refreshAll"/>
+ </property>
+ </bean>
+ <bean id="timerFactory" class="org.springframework.scheduling.timer.TimerFactoryBean">
+ <property name="daemon" value="true"/>
+ <property name="scheduledTimerTasks">
+ <list>
+ <ref local="refreshStaticContentCacheScheduledTask"/>
+ </list>
+ </property>
+ </bean>
+ -->
+
+ <import resource="classpath:org/apache/rave/persistence-applicationContext.xml"/>
</beans>
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1428544&r1=1428543&r2=1428544&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java (original)
+++ rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java Thu Jan 3 18:48:47 2013
@@ -27,7 +27,6 @@ import org.apache.rave.portal.web.render
import org.apache.rave.portal.web.renderer.ScriptLocation;
import org.apache.rave.portal.web.renderer.ScriptManager;
import org.apache.rave.portal.web.renderer.model.RegionWidgetWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.jsp.JspException;
@@ -43,13 +42,12 @@ public class RegionWidgetTag extends Abs
// Script block for disabled gadget
private static final String DISABLED_SCRIPT_BLOCK =
- "<script>rave.registerWidget(%1$s, {type: 'DISABLED'," +
- " regionWidgetId: %2$s," +
+ "<script>rave.registerWidget('%1$s', {type: 'DISABLED'," +
+ " regionWidgetId: '%2$s'," +
" disabledMessage: '%3$s'," +
" collapsed: %4$s," +
- " widgetId: %5$s});</script>";
+ " widgetId: '%5$s'});</script>";
- @Autowired
public RegionWidgetTag() {
super(RenderService.class);
}