Author: ieb
Date: Thu Nov 6 16:52:16 2008
New Revision: 712026
URL: http://svn.apache.org/viewvc?rev=712026&view=rev
Log:
SHINDIG-681
group is a reserved word in some databases and not suitable as a table
name. Thanks to Ben Smith for spotting
table name changed to person_group.
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationPropertyDb.java
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/GroupDb.java
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java?rev=712026&r1=712025&r2=712026&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationDb.java
Thu Nov 6 16:52:16 2008
@@ -41,7 +41,7 @@
* Stores information about applications
*/
@Entity
[EMAIL PROTECTED](name = "group")
[EMAIL PROTECTED](name = "application")
public class ApplicationDb implements DbObject {
/**
* The internal object ID used for references to this object. Should be
generated by the
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationPropertyDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationPropertyDb.java?rev=712026&r1=712025&r2=712026&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationPropertyDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/ApplicationPropertyDb.java
Thu Nov 6 16:52:16 2008
@@ -33,7 +33,7 @@
@PrimaryKeyJoinColumn(name = "oid")
public class ApplicationPropertyDb extends ListFieldDb {
/**
- * The group relationship connected with this property.
+ * The application relationship connected with this property.
*/
@ManyToOne(targetEntity = ApplicationDb.class)
@JoinColumn(name = "application_id", referencedColumnName = "oid")
Modified:
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/GroupDb.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/GroupDb.java?rev=712026&r1=712025&r2=712026&view=diff
==============================================================================
---
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/GroupDb.java
(original)
+++
incubator/shindig/trunk/java/samples/src/main/java/org/apache/shindig/social/opensocial/jpa/GroupDb.java
Thu Nov 6 16:52:16 2008
@@ -45,7 +45,7 @@
* associated with individuals and are used by those individuals to manage
people.
*/
@Entity
[EMAIL PROTECTED](name = "group")
[EMAIL PROTECTED](name = "person_group")
public class GroupDb implements DbObject {
/**
* The internal object ID used for references to this object. Should be
generated by the