summaryrefslogtreecommitdiff
path: root/orkbasej/java/net/sf/oreka/persistent
diff options
context:
space:
mode:
Diffstat (limited to 'orkbasej/java/net/sf/oreka/persistent')
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/Domain.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/LoginString.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecPort.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecPortFace.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecProgram.java3
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecSegment.java3
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecSession.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/RecTape.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/Service.java2
-rw-r--r--orkbasej/java/net/sf/oreka/persistent/User.java14
10 files changed, 14 insertions, 20 deletions
diff --git a/orkbasej/java/net/sf/oreka/persistent/Domain.java b/orkbasej/java/net/sf/oreka/persistent/Domain.java
index 7a0926b..27e3716 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Domain.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Domain.java
@@ -20,13 +20,11 @@ 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 c650859..b8f092e 100644
--- a/orkbasej/java/net/sf/oreka/persistent/LoginString.java
+++ b/orkbasej/java/net/sf/oreka/persistent/LoginString.java
@@ -22,13 +22,11 @@ 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 ebd83d0..83d6630 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPort.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPort.java
@@ -18,10 +18,8 @@ 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 e1671d6..46350bc 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecPortFace.java
@@ -18,10 +18,8 @@ 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 206ff69..6b8da30 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecProgram.java
@@ -38,7 +38,6 @@ import net.sf.oreka.Direction;
* @hibernate.class
*/
@Entity
-@Table(name = "recprogram")
public class RecProgram implements Serializable {
private int id;
@@ -84,7 +83,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 4ab9a1e..1091ff5 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSegment.java
@@ -34,7 +34,6 @@ import net.sf.oreka.Direction;
* @hibernate.class
*/
@Entity
-@Table(name = "recsegment")
public class RecSegment implements Serializable {
private int id;
@@ -263,7 +262,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 eff8417..8e77bfb 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecSession.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecSession.java
@@ -19,14 +19,12 @@ 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 66d796d..193f105 100644
--- a/orkbasej/java/net/sf/oreka/persistent/RecTape.java
+++ b/orkbasej/java/net/sf/oreka/persistent/RecTape.java
@@ -20,7 +20,6 @@ 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;
@@ -29,7 +28,6 @@ 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 701948e..5369365 100644
--- a/orkbasej/java/net/sf/oreka/persistent/Service.java
+++ b/orkbasej/java/net/sf/oreka/persistent/Service.java
@@ -21,7 +21,6 @@ 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;
@@ -29,7 +28,6 @@ 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 2ce404f..26cf656 100644
--- a/orkbasej/java/net/sf/oreka/persistent/User.java
+++ b/orkbasej/java/net/sf/oreka/persistent/User.java
@@ -26,13 +26,11 @@ 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;
@@ -147,6 +145,18 @@ 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;
}