Revision 1440426

Jump to revision:
Author:	mfranklin
Date:	Wed Jan 30 14:14:21 2013 UTC (11 years, 2 months ago)
Changed paths:	16
Log Message:	Fixed merge issues RAVE-880

Changed paths

Path	Details
rave/trunk/pom.xml	modified , text changed
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/persistence/jpa/util/JpaUtil.java	modified , text changed
rave/trunk/rave-components/rave-core/pom.xml	modified , text changed
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsEntry.java	modified , text changed
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/ActivityStreamsObject.java	modified , text changed
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsEntryImpl.java	modified , text changed
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/impl/ActivityStreamsObjectImpl.java	modified , text changed
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/ActivityStreamsRepository.java	modified , text changed
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsEntry.java	modified , text changed
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/JpaActivityStreamsObject.java	modified , text changed
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/repository/impl/JpaActivityStreamsRepository.java	modified , text changed
rave/trunk/rave-components/rave-jpa/src/main/resources/META-INF/persistence.xml	modified , text changed
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/persistence-applicationContext.xml	modified , text changed
rave/trunk/rave-components/rave-jpa/src/test/java/org/apache/rave/portal/activities/repository/JpaActivityEntryRepositoryTest.java	modified , text changed
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/java/org/apache/rave/opensocial/service/impl/DefaultActivityStreamsService.java	modified , text changed
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/java/org/apache/rave/opensocial/service/DefaultActivityStreamsServiceTest.java	modified , text changed