diff options
10 files changed, 20 insertions, 14 deletions
diff --git a/orkbasej/java/net/sf/oreka/persistent/Domain.java b/orkbasej/java/net/sf/oreka/persistent/Domain.java index 27e3716..7a0926b 100644 --- a/orkbasej/java/net/sf/oreka/persistent/Domain.java +++ b/orkbasej/java/net/sf/oreka/persistent/Domain.java @@ -20,11 +20,13 @@ import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; +import javax.persistence.Table; /** * @hibernate.class */ @Entity +@Table(name = "domain") public class Domain implements Serializable { private int id; diff --git a/orkbasej/java/net/sf/oreka/persistent/LoginString.java b/orkbasej/java/net/sf/oreka/persistent/LoginString.java index b8f092e..c650859 100644 --- a/orkbasej/java/net/sf/oreka/persistent/LoginString.java +++ b/orkbasej/java/net/sf/oreka/persistent/LoginString.java @@ -22,11 +22,13 @@ import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.persistence.Table; /** * @hibernate.class */ @Entity +@Table(name = "loginstring") public class LoginString implements Serializable { private int id; diff --git a/orkbasej/java/net/sf/oreka/persistent/RecPort.java b/orkbasej/java/net/sf/oreka/persistent/RecPort.java index 83d6630..ebd83d0 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecPort.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecPort.java @@ -18,8 +18,10 @@ import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; +import javax.persistence.Table; @Entity +@Table(name = "recport") public class RecPort implements Serializable { private int id; diff --git a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java index 46350bc..e1671d6 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java @@ -18,8 +18,10 @@ import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.persistence.Table; @Entity +@Table(name = "recportface") public class RecPortFace implements Serializable { private RecPort recPort; diff --git a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java index 6b8da30..206ff69 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java @@ -38,6 +38,7 @@ import net.sf.oreka.Direction; * @hibernate.class */ @Entity +@Table(name = "recprogram") public class RecProgram implements Serializable { private int id; @@ -83,7 +84,7 @@ public class RecProgram implements Serializable { // targetEntity="net.sf.oreka.persistent.RecSegment" // ) @JoinTable( - table=@Table(name="ProgToSeg"), + table=@Table(name="progtoseg"), joinColumns={@JoinColumn(name="ProgId")}, inverseJoinColumns={@JoinColumn(name="SegId")} ) diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java index 1091ff5..4ab9a1e 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java @@ -34,6 +34,7 @@ import net.sf.oreka.Direction; * @hibernate.class */ @Entity +@Table(name = "recsegment") public class RecSegment implements Serializable { private int id; @@ -262,7 +263,7 @@ public class RecSegment implements Serializable { */ @ManyToMany @JoinTable( - table=@Table(name="ProgToSeg"), + table=@Table(name="progtoseg"), joinColumns={@JoinColumn(name="SegId")}, inverseJoinColumns={@JoinColumn(name="ProgId")} ) diff --git a/orkbasej/java/net/sf/oreka/persistent/RecSession.java b/orkbasej/java/net/sf/oreka/persistent/RecSession.java index 8e77bfb..eff8417 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecSession.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecSession.java @@ -19,12 +19,14 @@ import java.util.Date; import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; +import javax.persistence.Table; import javax.persistence.Transient; /** * @hibernate.class */ @Entity +@Table(name = "recsession") public class RecSession implements Serializable { private int id; private Date timestamp = new Date(0); diff --git a/orkbasej/java/net/sf/oreka/persistent/RecTape.java b/orkbasej/java/net/sf/oreka/persistent/RecTape.java index 193f105..66d796d 100644 --- a/orkbasej/java/net/sf/oreka/persistent/RecTape.java +++ b/orkbasej/java/net/sf/oreka/persistent/RecTape.java @@ -20,6 +20,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; import javax.persistence.ManyToOne; +import javax.persistence.Table; import javax.persistence.Transient; import net.sf.oreka.Direction; @@ -28,6 +29,7 @@ import net.sf.oreka.Direction; * @hibernate.class */ @Entity +@Table(name = "rectape") public class RecTape implements Serializable { private int id; diff --git a/orkbasej/java/net/sf/oreka/persistent/Service.java b/orkbasej/java/net/sf/oreka/persistent/Service.java index 5369365..701948e 100644 --- a/orkbasej/java/net/sf/oreka/persistent/Service.java +++ b/orkbasej/java/net/sf/oreka/persistent/Service.java @@ -21,6 +21,7 @@ import java.io.Serializable; import javax.persistence.Entity; import javax.persistence.GeneratorType; import javax.persistence.Id; +import javax.persistence.Table; import net.sf.oreka.ServiceClass; @@ -28,6 +29,7 @@ import net.sf.oreka.ServiceClass; * @hibernate.class */ @Entity +@Table(name = "service") public class Service implements Serializable { private int id; diff --git a/orkbasej/java/net/sf/oreka/persistent/User.java b/orkbasej/java/net/sf/oreka/persistent/User.java index 26cf656..2ce404f 100644 --- a/orkbasej/java/net/sf/oreka/persistent/User.java +++ b/orkbasej/java/net/sf/oreka/persistent/User.java @@ -26,11 +26,13 @@ import javax.persistence.FetchType; import javax.persistence.GeneratorType; import javax.persistence.Id; import javax.persistence.OneToMany; +import javax.persistence.Table; /** * @hibernate.class */ @Entity +@Table(name = "user") public class User implements Serializable { private int id = 0; @@ -145,18 +147,6 @@ public class User implements Serializable { //loginStrings = new HashSet<LoginString>(); } -// @OneToMany(fetch = FetchType.EAGER) -// public Set<LoginString> getLoginStrings() { -// return loginStrings; -// } -// -// -// -// public void setLoginStrings(Set<LoginString> loginStrings) { -// this.loginStrings = loginStrings; -// } - - public Date getDateCreated() { return dateCreated; } |