svn commit: r958239 - in /shindig/trunk/java/samples/src: main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java

[ieb]

Author: ieb
Date: Sat Jun 26 15:46:18 2010
New Revision: 958239

URL: http://svn.apache.org/viewvc?rev=958239&view=rev
Log:
SHINDIG-1263 Patch supplied by Thomas Sauzedde, applied with minor 
modifications to keep tests passing, renames database table for friends to 
match other tables.

Modified:
    
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java
    
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java

Modified: 
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java?rev=958239&r1=958238&r2=958239&view=diff
==============================================================================
--- 
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java
 (original)
+++ 
shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/FriendDb.java
 Sat Jun 26 15:46:18 2010
@@ -25,12 +25,15 @@ import org.apache.shindig.social.opensoc
 
 import javax.persistence.Basic;
 import javax.persistence.Column;
+import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.MapKey;
 import javax.persistence.OneToMany;
+import javax.persistence.PrimaryKeyJoinColumn;
+import javax.persistence.Table;
 import javax.persistence.Version;
 
 import java.util.Map;
@@ -38,6 +41,9 @@ import java.util.Map;
 /**
  * Fiends relates users to one another with attributes.
  */
+...@entity 
+...@table(name = "friend")
+...@primarykeyjoincolumn(name = "oid") 
 public class FriendDb implements DbObject {
   /**
    * The internal object ID used for references to this object. Should be 
generated by the

Modified: 
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java?rev=958239&r1=958238&r2=958239&view=diff
==============================================================================
--- 
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
 (original)
+++ 
shindig/trunk/java/samples/src/test/java/org/apache/shindig/social/opensocial/jpa/spi/SpiDatabaseBootstrap.java
 Sat Jun 26 15:46:18 2010
@@ -199,7 +199,7 @@ public class SpiDatabaseBootstrap {
     }
     
     // Delete all data
-    entityManager.createNativeQuery("delete from FriendDb where 1 > 
0").executeUpdate();
+    entityManager.createNativeQuery("delete from friend where 1 > 
0").executeUpdate();
     entityManager.createNativeQuery("delete from activity_media where 1 > 
0").executeUpdate();
     entityManager.createNativeQuery("delete from url where 1 > 
0").executeUpdate();
     entityManager.createNativeQuery("delete from template_params where 1 > 
0").executeUpdate();