Commits

Paola Morales  committed 38555f1

Changes of Table Name in Domains

git-svn-id: http://svn.encuesta.me/trunk/encuestame@100439e2479b-dd58-4041-9f67-69c9b71f0610

  • Participants
  • Parent commits dade536

Comments (0)

Files changed (13)

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/Email.java

  */
 
 @Entity
-@Table(name = "cat_emails",
+@Table(name = "email",
         uniqueConstraints = {@UniqueConstraint(columnNames={"email"})})
 public class Email {
 

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/EmailList.java

  */
 
 @Entity
-@Table(name = "cat_list_emails")
+@Table(name = "emailList")
 public class EmailList {
 
     private Long idList;

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/EmailSubscribe.java

  */
 
 @Entity
-@Table(name = "cat_subscribe_emails")
+@Table(name = "emailSubscribe")
 public class EmailSubscribe {
 
     /****/

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/GeoPoint.java

  * @version $Id$
  */
 @Entity
-@Table(name = "cat_location")
+@Table(name = "geoPoint")
 public class GeoPoint {
 
     /** Id. **/

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/GeoPointFolder.java

  * @version $Id:$
  */
 @Entity
-@Table(name = "cat_location_folder")
+@Table(name = "geoPoint_folder")
 public class GeoPointFolder {
 
     /**

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/GeoPointType.java

  * @version $Id$
  */
 @Entity
-@Table(name = "cat_location_type")
+@Table(name = "geoPoint_type")
 public class GeoPointType {
 
     /** Location Type Id. */

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/Project.java

      * @return the locations
      */
     @ManyToMany()
-    @JoinTable(name="project_locations",
+    @JoinTable(name="project_geoPoint",
               joinColumns={@JoinColumn(name="cat_id_project")},
               inverseJoinColumns={@JoinColumn(name="cat_id_loc")})
     public Set<GeoPoint> getLocations() {
      * @return the groups
      */
     @ManyToMany()
-    @JoinTable(name="sec_project_group",
+    @JoinTable(name="project_group",
               joinColumns={@JoinColumn(name="cat_id_project")},
               inverseJoinColumns={@JoinColumn(name="sec_id_group")})
     public Set<Group> getGroups() {
      * @return the secUserSecondaries
      */
     @ManyToMany()
-    @JoinTable(name="sec_user_project",
+    @JoinTable(name="userAccount_project",
                joinColumns={@JoinColumn(name="cat_id_project")},
                inverseJoinColumns={@JoinColumn(name="sec_id_secondary")})
     public Set<UserAccount> getSecUserSecondaries() {

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/Account.java

  */
 
 @Entity
-@Table(name = "sec_user")
+@Table(name = "account")
 public class Account{
 
     /** User Id. **/

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/Group.java

  * @version $Id$
  */
 @Entity
-@Table(name = "sec_groups")
+@Table(name = "groups")
 public class Group {
 
      /**
      * @return the secPermissions
      */
     @ManyToMany()
-    @JoinTable(name="sec_group_permission",
+    @JoinTable(name="groups_permission",
                joinColumns={@JoinColumn(name="sec_id_group")},
                inverseJoinColumns={@JoinColumn(name="sec_id_permission")})
     public Set<Permission> getSecPermissions() {
      * @return the projects
      */
     @ManyToMany()
-    @JoinTable(name="sec_project_group",
+    @JoinTable(name="project_group",
               joinColumns={@JoinColumn(name="sec_id_group")},
               inverseJoinColumns={@JoinColumn(name="cat_id_project")})
     public Set<Project> getProjects() {

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/Permission.java

  * @version $Id$
  */
 @Entity
-@Table(name = "sec_permission")
+@Table(name = "permission")
 public class Permission {
 
     private Long idPermission;
      * @return the secUserSecondaries
      */
     @ManyToMany()
-    @JoinTable(name="sec_user_permission",
+    @JoinTable(name="userAccount_permission",
                joinColumns={@JoinColumn(name="sec_id_permission")},
                inverseJoinColumns={@JoinColumn(name="sec_id_secondary")})
     public Set<UserAccount> getSecUserSecondaries() {
      * @return the secGroups
      */
     @ManyToMany()
-    @JoinTable(name="sec_group_permission",
+    @JoinTable(name="group_permission",
                joinColumns={@JoinColumn(name="sec_id_permission")},
                inverseJoinColumns={@JoinColumn(name="sec_id_group")})
     public Set<Group> getSecGroups() {

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/SocialAccount.java

 //    )
 
 @Entity
-@Table(name = "sec_user_twitter_account")
+@Table(name = "social_account")
 public class SocialAccount {
 
     /**

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/security/UserAccount.java

  * @version $Id$
  */
 @Entity
-@Table(name = "sec_user_secondary",
+@Table(name = "userAccount",
        uniqueConstraints = {@UniqueConstraint(columnNames={"username", "email"})}
   )
 public class UserAccount {
      * @return the secUserPermissions
      */
     @ManyToMany(cascade=CascadeType.ALL)
-    @JoinTable(name="sec_user_permission",
+    @JoinTable(name="userAccount_permission",
                joinColumns={@JoinColumn(name="sec_id_secondary")},
                inverseJoinColumns={@JoinColumn(name="sec_id_permission")})
     public Set<Permission> getSecUserPermissions() {
      * @return the projects
      */
     @ManyToMany(cascade=CascadeType.ALL)
-    @JoinTable(name="sec_user_project",
+    @JoinTable(name="userAccount_project",
                joinColumns={@JoinColumn(name="sec_id_secondary")},
                inverseJoinColumns={@JoinColumn(name="cat_id_project")})
     public Set<Project> getProjects() {

File encuestame-persistence/src/main/java/org/encuestame/persistence/domain/survey/PollFolder.java

  * @version $Id: $
  */
 @Entity
-@Table(name = "poll_Folder")
+@Table(name = "poll_folder")
 public class PollFolder extends AbstractFolder implements IFolder{
      private Long id;