Author: mfranklin
Date: Mon Jun 4 15:33:45 2012
New Revision: 1346014
URL: http://svn.apache.org/viewvc?rev=1346014&view=rev
Log:
Renamed JPA only Entity (RAVE-625)
Added:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
- copied, changed from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
Removed:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
Copied:
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
(from r1345993,
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java)
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java?p2=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java&p1=rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java&r1=1345993&r2=1346014&rev=1346014&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PersonAssociation.java
(original)
+++
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/JpaPersonAssociation.java
Mon Jun 4 15:33:45 2012
@@ -30,7 +30,7 @@ import javax.persistence.*;
@Table(name = "person_association",
uniqueConstraints = @UniqueConstraint(columnNames = {"follower_id",
"followed_id"})
)
-public class PersonAssociation implements BasicEntity {
+public class JpaPersonAssociation implements BasicEntity {
@Id
@Column(name = "entity_id")
@@ -78,7 +78,7 @@ public class PersonAssociation implement
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- PersonAssociation that = (PersonAssociation) o;
+ JpaPersonAssociation that = (JpaPersonAssociation) o;
if (entityId != null ? !entityId.equals(that.entityId) : that.entityId
!= null) return false;
Modified:
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml?rev=1346014&r1=1346013&r2=1346014&view=diff
==============================================================================
---
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
(original)
+++
rave/branches/model_interfaces/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/main/resources/META-INF/persistence.xml
Mon Jun 4 15:33:45 2012
@@ -25,7 +25,7 @@
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
<class>org.apache.rave.portal.model.JpaPerson</class>
<class>org.apache.rave.portal.model.JpaGroup</class>
- <class>org.apache.rave.portal.model.PersonAssociation</class>
+ <class>org.apache.rave.portal.model.JpaPersonAssociation</class>
<class>org.apache.rave.portal.model.JpaPersonProperty</class>
<class>org.apache.rave.portal.model.JpaAddress</class>
<class>org.apache.rave.portal.model.JpaOrganization</class>
