properties

sbin/create_dm_db.sh

@@ -180,7 +180,9 @@ DM_DB_TABLES="\
   user_info \
   role_type \
   user_system_role \
-  policy_type 
+  policy_type \
+  policy_property \
+  allowed_policy_value
 "
 for dbTable in $DM_DB_TABLES; do
     dbFile=populate_$dbTable.sql

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/ExperimentPolicyPropertyValue.java

@@ -6,6 +6,7 @@
 
 package gov.anl.aps.dm.portal.model.entities;
 
+import java.util.Date;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -17,6 +18,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlRootElement;
 /**
@@ -44,6 +48,16 @@ public class ExperimentPolicyPropertyValue extends CloneableEntity
     @Size(min = 1, max = 2147483647)
     @Column(name = "policy_property_value")
     private String policyPropertyValue;
+    @Basic(optional = false)
+    @NotNull
+    @Size(min = 1, max = 2147483647)
+    @Column(name = "modified_by")
+    private String modifiedBy;
+    @Basic(optional = false)
+    @NotNull
+    @Column(name = "modified_date")
+    @Temporal(TemporalType.DATE)
+    private Date modifiedDate;
     @JoinColumn(name = "policy_property_id", referencedColumnName = "id")
     @ManyToOne(optional = false)
     private PolicyProperty policyProperty;
@@ -94,6 +108,22 @@ public class ExperimentPolicyPropertyValue extends CloneableEntity
     public void setExperimentPolicy(ExperimentPolicy experimentPolicy) {
         this.experimentPolicy = experimentPolicy;
     }
+    
+    public String getModifiedBy() {
+        return modifiedBy;
+    }
+
+    public void setModifiedBy(String modifiedBy) {
+        this.modifiedBy = modifiedBy;
+    }
+
+    public Date getModifiedDate() {
+        return modifiedDate;
+    }
+
+    public void setModifiedDate(Date modifiedDate) {
+        this.modifiedDate = modifiedDate;
+    }
 
     @Override
     public int hashCode() {
@@ -116,5 +146,5 @@ public class ExperimentPolicyPropertyValue extends CloneableEntity
     public String toString() {
         return "gov.anl.aps.dm.portal.model.entities.ExperimentPolicyPropertyValue[ id=" + id + " ]";
     }
-        
+
 }

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/PolicyType.java

@@ -14,11 +14,9 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;