From d0cb11fcb8aa56081291f40746ec1c85844ed6a5 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 26 Dec 2013 16:44:48 +0000
Subject: [PATCH] #333 feature - Fixed some JPA config issues
---
securis/src/main/java/net/curisit/securis/db/License.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/License.java b/securis/src/main/java/net/curisit/securis/db/License.java
index c23180b..fb4ce46 100644
--- a/securis/src/main/java/net/curisit/securis/db/License.java
+++ b/securis/src/main/java/net/curisit/securis/db/License.java
@@ -5,6 +5,7 @@
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -24,12 +25,13 @@
@Entity
@Table(name = "license")
@NamedQueries(
- { @NamedQuery(name = "list-licenses", query = "SELECT pa FROM Pack pa") })
+ { @NamedQuery(name = "list-licenses", query = "SELECT l FROM License l") })
public class License implements Serializable {
private static final long serialVersionUID = 1L;
@Id
+ @GeneratedValue
private int id;
private String code;
@@ -42,8 +44,8 @@
private Organization organization;
@ManyToOne
- @JoinColumn(name = "license_type_id")
- private LicenseType licenseType;
+ @JoinColumn(name = "pack_id")
+ private Pack pack;
@ManyToOne
@JoinColumn(name = "created_by")
@@ -79,14 +81,6 @@
this.organization = organization;
}
- public LicenseType getLicenseType() {
- return licenseType;
- }
-
- public void setLicenseType(LicenseType licenseType) {
- this.licenseType = licenseType;
- }
-
public User getCreatedBy() {
return createdBy;
}
@@ -103,4 +97,12 @@
this.numLicenses = numLicenses;
}
+ public Pack getPack() {
+ return pack;
+ }
+
+ public void setPack(Pack pack) {
+ this.pack = pack;
+ }
+
}
--
Gitblit v1.3.2