svn commit: r961394 - in /incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao: Attachment.java Comment.java Job.java Message.java OrgEntity.java PresentationParameter.java Task.java TaskOrgEntity.java

[wi...@apache.org]

Author: witek
Date: Wed Jul  7 14:41:55 2010
New Revision: 961394

URL: http://svn.apache.org/viewvc?rev=961394&view=rev
Log:
HISE-44 table names change

Modified:
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Attachment.java Wed Jul  7 14:41:55 2010
@@ -31,7 +31,7 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 
 @Entity
-@Table(name = "ATTACHMENT")
+@Table(name = "HISE_ATTACHMENT")
 public class Attachment extends JpaBase {
 
     @Id

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java Wed Jul  7 14:41:55 2010
@@ -38,7 +38,7 @@ import javax.persistence.TemporalType;
  * @author Mateusz Lipczyński
  */
 @Entity
-@Table(name = "T_COMMENT")
+@Table(name = "HISE_COMMENT")
 public class Comment extends JpaBase {
     
     @Id

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Job.java Wed Jul  7 14:41:55 2010
@@ -27,12 +27,14 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 /**
  * 
  * @author Rafał Rusin
  */
 @Entity
+@Table(name = "HISE_JOB")
 public class Job extends JpaBase {
 
     @Id

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java Wed Jul  7 14:41:55 2010
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  * @author Witek Wołejszo
  */
 @Entity
-@Table(name = "MESSAGE")
+@Table(name = "HISE_MESSAGE")
 public class Message extends JpaBase {
     
     private static final Log log = LogFactory.getLog(Message.class);

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java Wed Jul  7 14:41:55 2010
@@ -36,7 +36,7 @@ import javax.persistence.Table;
  * @author Witek Wołejszo
  */
 @Entity
-@Table(name = "ORG_ENTITY")
+@Table(name = "HISE_ENTITY")
 public class OrgEntity extends JpaBase {
 
 //    @Id
@@ -53,7 +53,7 @@ public class OrgEntity extends JpaBase {
     private String userPassword;
     
     @OneToMany(cascade = {CascadeType.ALL})
-    @JoinTable(name="USER_GROUPS")
+    @JoinTable(name="HISE_USER_GROUPS")
     private Collection<OrgEntity> userGroups = new HashSet<OrgEntity>();
 
     

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/PresentationParameter.java Wed Jul  7 14:41:55 2010
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  * @author Witek Wołejszo
  */
 @Entity
-@Table(name = "PRESENTATION_PARAMETERS")
+@Table(name = "HISE_PRES_PARAM")
 public class PresentationParameter extends JpaBase {
     
     private final Log log = LogFactory.getLog(PresentationParameter.class);

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Task.java Wed Jul  7 14:41:55 2010
@@ -60,7 +60,7 @@ import org.springframework.beans.factory
  * @author Warren Crossing
  */
 @Entity
-@Table(name = "TASK")
+@Table(name = "HISE_TASK")
 @Configurable(preConstruction = true)
 public class Task extends JpaBase {
 
@@ -161,7 +161,7 @@ public class Task extends JpaBase {
      */
     @OneToMany(cascade = { CascadeType.ALL })
     @MapKey(name = "partName")
-    @JoinTable(name = "TASK_MSG_INPUT")
+    @JoinTable(name = "HISE_TASK_MSG_INPUT")
     private Map<String, Message> input = new HashMap<String, Message>();
 
     /**
@@ -169,7 +169,7 @@ public class Task extends JpaBase {
      */
     @OneToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE })
     @MapKey(name = "partName")
-    @JoinTable(name = "TASK_MSG_OUTPUT")
+    @JoinTable(name = "HISE_TASK_MSG_OUTPUT")
     private Map<String, Message> output = new HashMap<String, Message>();
 
     /**
@@ -258,7 +258,7 @@ public class Task extends JpaBase {
 //    private List<Deadline> deadlines = new ArrayList<Deadline>();
     
     @OneToMany(cascade = {CascadeType.ALL})
-    @JoinTable(name="DEADLINE")
+    @JoinTable(name="HISE_DEADLINE")
     private Set<Job> deadlines = new HashSet<Job>();
 
     /**

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java?rev=961394&r1=961393&r2=961394&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/TaskOrgEntity.java Wed Jul  7 14:41:55 2010
@@ -25,6 +25,7 @@ import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 /**
  * Task Assignee - member of generic human role.
@@ -32,6 +33,7 @@ import javax.persistence.ManyToOne;
  * @author Witek Wołejszo
  */
 @Entity
+@Table(name = "HISE_TASK_ORGENT")
 public class TaskOrgEntity extends JpaBase {
 
     @Id