Revision 1428505

Jump to revision:
Author:	mfranklin
Date:	Thu Jan 3 17:45:48 2013 UTC (11 years, 3 months ago)
Changed paths:	9
Log Message:	Cleaned up final merge bugs

Changed paths

Path	Details
rave/branches/mongo/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java	modified , text changed
rave/branches/mongo/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultPageServiceTest.java	modified , text changed
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/model/conversion/impl/MongoDbWidgetConverter.java	modified , text changed
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbMapReduceStatisticsAggregator.java	modified , text changed
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbPageRepository.java	modified , text changed
rave/branches/mongo/rave-components/rave-mongodb/src/main/java/org/apache/rave/portal/repository/impl/MongoDbWidgetRepository.java	modified , text changed
rave/branches/mongo/rave-portal-resources/src/main/resources_mongo/db/initial-data.json	modified , text changed
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp	modified , text changed
rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp	modified , text changed