You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by ie...@apache.org on 2008/09/17 14:23:12 UTC
svn commit: r696270 - in /incubator/shindig/trunk/java/samples/src/main:
java/org/apache/shindig/social/opensocial/jpa/ resources/META-INF/
Author: ieb
Date: Wed Sep 17 05:23:11 2008
New Revision: 696270
URL: http://svn.apache.org/viewvc?rev=696270&view=rev
Log:
Changed the name of PersonPropertiesDb to PersonPropertyDb to correctly reflect that its contains a single property, not a list.
Added:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertyDb.java
- copied, changed from r696269, incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertiesDb.java
Removed:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertiesDb.java
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
incubator/shindig/trunk/java/samples/src/main/resources/META-INF/orm.xml
Modified: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java?rev=696270&r1=696269&r2=696270&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonDb.java Wed Sep 17 05:23:11 2008
@@ -210,8 +210,8 @@
@Column(name = "about_me", length = 255)
protected String aboutMe;
- @OneToMany(targetEntity = PersonPropertiesDb.class, mappedBy = "person", cascade = ALL)
- protected List<PersonPropertiesDb> properties = new ArrayList<PersonPropertiesDb>();
+ @OneToMany(targetEntity = PersonPropertyDb.class, mappedBy = "person", cascade = ALL)
+ protected List<PersonPropertyDb> properties = new ArrayList<PersonPropertyDb>();
@OneToMany(targetEntity = PersonAccountDb.class, mappedBy = "person", cascade = ALL)
protected List<Account> accounts;
@@ -1149,21 +1149,21 @@
// add new entries
for (String v : e.getValue()) {
boolean present = false;
- for (PersonPropertiesDb pp : properties) {
+ for (PersonPropertyDb pp : properties) {
if (e.getKey().equals(pp.getType()) && v.equals(pp.getValue())) {
present = true;
break;
}
}
if (!present) {
- PersonPropertiesDb pp = new PersonPropertiesDb();
+ PersonPropertyDb pp = new PersonPropertyDb();
pp.setType(e.getKey());
pp.setValue(v);
}
}
// remove missing entries
- List<PersonPropertiesDb> toRemove = new ArrayList<PersonPropertiesDb>();
- for (PersonPropertiesDb pp : properties) {
+ List<PersonPropertyDb> toRemove = new ArrayList<PersonPropertyDb>();
+ for (PersonPropertyDb pp : properties) {
if (e.getKey().equals(pp.getType())) {
boolean present = false;
for (String v : e.getValue()) {
@@ -1230,7 +1230,7 @@
toSave.put(TURNONS_PROPERTY, this.turnOns);
toSave.put(TVSHOWS_PROPERTY, this.tvShows);
- for (PersonPropertiesDb pp : properties) {
+ for (PersonPropertyDb pp : properties) {
List<String> l = toSave.get(pp.type);
if (l != null) {
l.add(pp.getValue());
Copied: incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertyDb.java (from r696269, incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertiesDb.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertyDb.java?p2=incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertyDb.java&p1=incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertiesDb.java&r1=696269&r2=696270&rev=696270&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertiesDb.java (original)
+++ incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/PersonPropertyDb.java Wed Sep 17 05:23:11 2008
@@ -32,7 +32,7 @@
@Entity
@Table(name="person_properties")
@PrimaryKeyJoinColumn(name="oid")
-public class PersonPropertiesDb extends ListFieldDb {
+public class PersonPropertyDb extends ListFieldDb {
/**
* The person who this property is associated with.
Modified: incubator/shindig/trunk/java/samples/src/main/resources/META-INF/orm.xml
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/resources/META-INF/orm.xml?rev=696270&r1=696269&r2=696270&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/src/main/resources/META-INF/orm.xml (original)
+++ incubator/shindig/trunk/java/samples/src/main/resources/META-INF/orm.xml Wed Sep 17 05:23:11 2008
@@ -46,6 +46,12 @@
</entity>
<entity class="org.apache.shindig.social.opensocial.jpa.PhotoDb">
</entity>
- <entity class="org.apache.shindig.social.opensocial.jpa.PersonPropertiesDb">
+ <entity class="org.apache.shindig.social.opensocial.jpa.PersonPropertyDb">
+ </entity>
+ <entity class="org.apache.shindig.social.opensocial.jpa.FriendDb">
+ </entity>
+ <entity class="org.apache.shindig.social.opensocial.jpa.FriendPropertyDb">
+ </entity>
+ <entity class="org.apache.shindig.social.opensocial.jpa.GroupDb">
</entity>
</entity-mappings>