No commit message

No commit message

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/AllowedPolicyValueController.java

@@ -6,7 +6,11 @@ import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
 import gov.anl.aps.dm.portal.model.entities.AllowedPolicyValue;
 import gov.anl.aps.dm.portal.model.beans.AllowedPolicyValueFacade;
 import gov.anl.aps.dm.portal.model.entities.PolicyProperty;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import javax.ejb.EJB;
 import javax.inject.Named;
 import javax.enterprise.context.SessionScoped;
@@ -20,9 +24,33 @@ import org.apache.log4j.Logger;
 public class AllowedPolicyValueController extends CrudEntityController<AllowedPolicyValue, AllowedPolicyValueFacade>
 {
     private static final Logger logger = Logger.getLogger(AllowedPolicyValueController.class.getName());
+    
+    class ValueCopy {
+        private final String value;
+        private final String description;
+
+        ValueCopy(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+        
+        boolean isUpdated(AllowedPolicyValue editedAllowedPolicyValue) {
+            return (!editedAllowedPolicyValue.getPolicyValue().equals(value) || !editedAllowedPolicyValue.getDescription().equals(description));
+        }
+        
+        String getValue() {
+            return value;
+        }
+        
+        String getDescription() {
+            return description;
+        }
+    }
 
     @EJB
     private AllowedPolicyValueFacade allowedPolicyValueFacade;
+    
+    private final Map<AllowedPolicyValue, ValueCopy> editMap = new HashMap<>();
 
     class AllowedPolicyValueInfoTable extends DataTableController<AllowedPolicyValue> {
 
@@ -76,12 +104,17 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
 
     @Override
     public DataModel createListDataModel() {
-        return new ListDataModel((List) allowedPolicyValueFacade.findByPolicyPropertyId(policyProperty.getId()));
+        List<AllowedPolicyValue> allowedValueList = allowedPolicyValueFacade.findByPolicyPropertyId(policyProperty.getId());        
+        for (AllowedPolicyValue allowedPolicyValue : allowedValueList) {
+            editMap.put(allowedPolicyValue, new ValueCopy(allowedPolicyValue.getPolicyValue(), allowedPolicyValue.getDescription()));
+        }
+        return new ListDataModel((List) allowedValueList);
     }
 
     @Override
     public List<AllowedPolicyValue> getAvailableItems() {
-        return (List<AllowedPolicyValue>) allowedPolicyValueFacade.findByPolicyPropertyId(policyProperty.getId());
+        List<AllowedPolicyValue> allowedValueList = allowedPolicyValueFacade.findByPolicyPropertyId(policyProperty.getId());
+        return (allowedValueList);
     }
 
     @Override
@@ -105,7 +138,6 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
     @Override
     public String prepareEdit(AllowedPolicyValue allowedPolicyValue) {
         super.prepareEdit(allowedPolicyValue);
- //       return "editAllowedPolicyValue?faces-redirect=true";
         return "/views/allowedPolicyValue/edit?faces-redirect=true";
     }
 
@@ -113,31 +145,33 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
     public String prepareView(AllowedPolicyValue allowedPolicyValue) {
         current = allowedPolicyValue;
         super.prepareView(allowedPolicyValue);
-  //      return "editAllowedPolicyValue?faces-redirect=true";
         return "/views/allowedPolicyValue/view?faces-redirect=true";
     }
 
     @Override
     public String prepareCreate() {
         super.prepareCreate();
-//        return "create?faces-redirect=true";
         return "/views/allowedPolicyValue/create?faces-redirect=true";
     }
 
     @Override
     public String create() { 
+        AllowedPolicyValue newValue = current;
         if (super.create() == null) {
             return null;
         }
+        policyProperty.getAllowedPolicyValueList().add(newValue);
         allowedPolicyValueInfoTable.resetList();
-        return "/views/policyProperty/view?faces-redirect=true";
+        return null;
     }
     
      @Override
     public String destroy() {
-        String view = super.destroy();
+        AllowedPolicyValue propertyValue = current;
+        super.destroy();
+        policyProperty.getAllowedPolicyValueList().remove(propertyValue);
         clear();
-        return view;
+        return null;
     }
 
     @Override
@@ -156,16 +190,18 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
 
     @Override
     public void prepareEntityUpdate(AllowedPolicyValue allowedPolicyValue) throws DmPortalException {
-        current.setPolicyProperty(policyProperty);
         if ((allowedPolicyValue.getPolicyValue() == null) || (allowedPolicyValue.getPolicyValue().length() == 0)) {
             throw new MissingProperty("Policy Value is missing.");
         }
-        List<AllowedPolicyValue> propertyAllowedPolicyValueList = allowedPolicyValueFacade.findByPolicyPropertyId(policyProperty.getId());
-        for (AllowedPolicyValue policyValue : propertyAllowedPolicyValueList) {
-            if ((allowedPolicyValue.getPolicyValue().equals(policyValue.getPolicyValue()))) {
+        ValueCopy tempValueCopy = editMap.get(allowedPolicyValue);
+        editMap.remove(allowedPolicyValue);
+        Collection<ValueCopy> propertyAllowedPolicyValueList = editMap.values();
+        for (ValueCopy valueCopy : propertyAllowedPolicyValueList) {
+            if ((valueCopy.getValue().equals(allowedPolicyValue.getPolicyValue()))) {
                 throw new ObjectAlreadyExists("allowed policy value " + allowedPolicyValue.getPolicyValue() + " already exists for this property.");
             }
         }
+        editMap.put(allowedPolicyValue, tempValueCopy);
     }
 
     @Override
@@ -184,6 +220,22 @@ public class AllowedPolicyValueController extends CrudEntityController<AllowedPo
     public void clear() {
         allowedPolicyValueInfoTable.resetList();
         resetList();
+        editMap.clear();
+    }
+    
+    @Override
+    public String update() {
+        Iterator<AllowedPolicyValue> iterator = getListDataModel().iterator();
+        while (iterator.hasNext()) {
+            AllowedPolicyValue editedAllowedPolicyValue = iterator.next();
+            ValueCopy valueCopy = editMap.get(editedAllowedPolicyValue);
+            if ((valueCopy != null) && (valueCopy.isUpdated(editedAllowedPolicyValue))) {
+                current = editedAllowedPolicyValue;
+                super.update();
+            }            
+        }
+        clear();
+        return null;
     }
 
 }

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentController.java

@@ -6,23 +6,26 @@ import gov.anl.aps.dm.portal.exceptions.DmPortalException;
 import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
 import gov.anl.aps.dm.portal.exceptions.InvalidDate;
 import gov.anl.aps.dm.portal.exceptions.MissingProperty;
-import gov.anl.aps.dm.portal.model.beans.AllowedPolicyValueFacade;
 import gov.anl.aps.dm.portal.model.entities.Experiment;
 import gov.anl.aps.dm.portal.model.beans.ExperimentFacade;
+import gov.anl.aps.dm.portal.model.beans.ExperimentPolicyFacade;
+import gov.anl.aps.dm.portal.model.beans.ExperimentPolicyPropertyValueFacade;
 import gov.anl.aps.dm.portal.model.beans.PolicyTypeFacade;
 import gov.anl.aps.dm.portal.model.beans.RoleTypeFacade;
 import gov.anl.aps.dm.portal.model.beans.UserExperimentRoleFacade;
 import gov.anl.aps.dm.portal.model.beans.UserInfoFacade;
 import gov.anl.aps.dm.portal.model.entities.CloneableEntity;
 import gov.anl.aps.dm.portal.model.entities.ExperimentPolicy;
+import gov.anl.aps.dm.portal.model.entities.ExperimentPolicyPropertyValue;
+import gov.anl.aps.dm.portal.model.entities.PolicyProperty;
 import gov.anl.aps.dm.portal.model.entities.PolicyType;
 import gov.anl.aps.dm.portal.model.entities.RoleType;
 import gov.anl.aps.dm.portal.model.entities.UserExperimentRole;
 import gov.anl.aps.dm.portal.model.entities.UserInfo;
 import gov.anl.aps.dm.portal.utilities.SessionUtility;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -53,7 +56,16 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
         
     @EJB
     private UserExperimentRoleFacade userExperimentRoleFacade;
-        
+    
+    @EJB
+    private PolicyTypeFacade policyTypeFacade;
+    
+    @EJB
+    private ExperimentPolicyFacade experimentPolicyFacade;
+    
+    @EJB
+    private ExperimentPolicyPropertyValueFacade experimentPolicyPropertyValueFacade;
+            
     public class ExperimentUser extends CloneableEntity {
 
         String name;
@@ -73,8 +85,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
         
         public UserInfo getUser() {
             return user;
-        }
-        
+        }        
                 
         public String getGlobusUsername() {
             return user.getGlobusUsername();
@@ -198,22 +209,140 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
             return "noExperimentUsersTable";
         }
     }
+
+    @SessionScoped
+    class ExperimentPolicyTable extends DataTableController<ExperimentPolicy> {
+
+        @Override
+        public String getClassName() {
+            return "ExperimentPolicy";
+        }
+
+        @Override
+        public List<ExperimentPolicy> findAll() {
+            resetList();
+            List<ExperimentPolicy> experimentPolicies = experimentPolicyFacade.findByExperimentId(current.getId());
+            return experimentPolicies;
+        }
+        
+        @Override
+        public String getTableName() {
+            return "experimentPolicyTable";
+        }        
+    }
     
-    private int rows = 25;
+    class PolicyPropertyValue extends CloneableEntity {
+        private PolicyProperty policyProperty;
+        private String value;
+
+        public PolicyProperty getPolicyProperty() {
+            return policyProperty;
+        }
+
+        public void setPolicyProperty(PolicyProperty policyProperty) {
+            this.policyProperty = policyProperty;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public void setValue(String value) {
+            this.value = value;
+        }        
+    }
+    
+    @SessionScoped
+    class NoPolicyValueTable extends DataTableController<PolicyType> {
+
+        List<PolicyPropertyValue> [] noPropertyList;
+        
+        NoPolicyValueTable() {
+//            noPropertyList = new ArrayList[policyTypes.size() + 1]; // add 1 so the index is policyTypeId
+            // TODO need to replace the number with constant temporary for testing
+            noPropertyList = new ArrayList[3];
+            for (int i=0; i<noPropertyList.length; i++) {
+                noPropertyList[i] = new ArrayList();
+            }
+        }
+        
+        void clear() {
+            for (List<PolicyPropertyValue> list : noPropertyList) {
+                list.clear();
+            }            
+        }
+        
+        public List<PolicyPropertyValue> getNoPropertyList(int policyTypeId) {
+            return noPropertyList[policyTypeId];
+        }
+        
+        @Override
+        public String getClassName() {
+            return "PolicyType";
+        }
+
+        @Override
+        public List<PolicyType> findAll() {
+            resetList();
+            clear();
+            List<PolicyType> noPolicyTypes = new ArrayList<>();
+            for (PolicyType policyType : policyTypes.values()) {
+                fillMissingProperties(policyType);
+                if (!noPropertyList[policyType.getId()].isEmpty()) {
+                    noPolicyTypes.add(policyType);
+                }
+            }
+
+            return noPolicyTypes;
+        }
+        
+        private void fillMissingProperties(PolicyType policyType) {
+             List<ExperimentPolicy> experimentPolicies = current.getExperimentPolicyList();           
+             ExperimentPolicy theExperimentPolicy = null;
+             for (ExperimentPolicy experimentPolicy : experimentPolicies) {
+                 if (experimentPolicy.getPolicyType().getId() == policyType.getId()) {
+                     theExperimentPolicy = experimentPolicy;
+                 }
+             }
+
+             for (PolicyProperty policyProperty : policyType.getPolicyPropertyList()) {
+                if ((theExperimentPolicy == null) || (!hasProperty(theExperimentPolicy, policyProperty))) {
+                    PolicyPropertyValue policyPropertyValue = new PolicyPropertyValue();
+                    policyPropertyValue.policyProperty = policyProperty;
+                    policyPropertyValue.value = policyProperty.getDefaultValue();
+                    noPropertyList[policyType.getId()].add(policyPropertyValue);
+                }                 
+             }
+        }
+        
+        private boolean hasProperty(ExperimentPolicy experimentPolicy, PolicyProperty policyProperty) {
+            for (ExperimentPolicyPropertyValue ExperimentPolicyPropertyValue : experimentPolicy.getExperimentPolicyPropertyValueList()) {
+                if (ExperimentPolicyPropertyValue.getPolicyProperty().equals(policyProperty)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+    }
+  
+    private final int rows = 25;
+    private ExperimentPolicyPropertyValue experimentPropertyToDelete;
 
     private ExperimentController.ExperimentUsersTable experimentUsersListTable = new ExperimentController.ExperimentUsersTable();
     private ExperimentController.ExperimentUsersTable experimentUsersEditTable = new ExperimentController.ExperimentUsersTable();
     private ExperimentController.NoExperimentUsersTypeTable noExperimentUsersTypeTable = new ExperimentController.NoExperimentUsersTypeTable();
+    private ExperimentController.ExperimentPolicyTable experimentPolicyListTable = new ExperimentController.ExperimentPolicyTable();
+    private ExperimentController.ExperimentPolicyTable experimentPolicyEditTable = new ExperimentController.ExperimentPolicyTable();
+    private ExperimentController.NoPolicyValueTable noPolicyValueTable = new ExperimentController.NoPolicyValueTable();    
 
     final private Map<UserInfo, ExperimentUser> experimentUsers = new HashMap<>();
     final private Map<String, RoleType> experimentRoles = new HashMap<>();
+    final private Map<Integer, PolicyType> policyTypes = new HashMap<>();
     int maxExperimentRoleTypeId = 0;
     boolean initialized = false;
 
     public ExperimentController() {
-        this.experimentUsersListTable = new ExperimentController.ExperimentUsersTable();
-        this.experimentUsersEditTable = new ExperimentController.ExperimentUsersTable();
-        this.noExperimentUsersTypeTable = new ExperimentController.NoExperimentUsersTypeTable();
     }
 
     public int getRows() {
@@ -271,9 +400,13 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
                 }
             }
         }
+        List<PolicyType> policyTypesList = policyTypeFacade.findAll();
+        for (PolicyType policyType : policyTypesList) {
+            policyTypes.put(policyType.getId(), policyType);
+        }
         initialized = true;
     }
-
+    
     @Override
     public void prepareEntityInsert(Experiment experiment) throws ObjectAlreadyExists, InvalidDate, MissingProperty {
         if ((experiment.getName() == null) || (experiment.getName().length() == 0)){
@@ -323,6 +456,8 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
         experimentUsersEditTable.resetList();
         experimentUsers.clear();
         noExperimentUsersTypeTable.resetList();
+        experimentPolicyListTable.resetList();
+        experimentPolicyEditTable.resetList();
     }
     
     public ExperimentController.ExperimentUsersTable getExperimentUsersListTable() {
@@ -348,7 +483,39 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
     public void setNoExperimentUsersTypeTable(ExperimentController.NoExperimentUsersTypeTable noExperimentUsersTypeTable) {
         this.noExperimentUsersTypeTable = noExperimentUsersTypeTable;
     }
-                 
+
+    public ExperimentPolicyTable getExperimentPolicyListTable() {
+        return experimentPolicyListTable;
+    }
+
+    public void setExperimentPolicyListTable(ExperimentPolicyTable experimentPolicyTable) {
+        this.experimentPolicyListTable = experimentPolicyTable;
+    }
+
+    public ExperimentPolicyTable getExperimentPolicyEditTable() {
+        return experimentPolicyEditTable;
+    }
+
+    public void setExperimentPolicyEditTable(ExperimentPolicyTable experimentPolicyEditTable) {
+        this.experimentPolicyEditTable = experimentPolicyEditTable;
+    }
+
+    public NoPolicyValueTable getNoPolicyValueTable() {
+        return noPolicyValueTable;
+    }
+
+    public void setNoPolicyValueTable(NoPolicyValueTable noPolicyValueTable) {
+        this.noPolicyValueTable = noPolicyValueTable;
+    }
+
+    public ExperimentPolicyPropertyValue getExperimentPropertyToDelete() {
+        return experimentPropertyToDelete;
+    }
+
+    public void setExperimentPropertyToDelete(ExperimentPolicyPropertyValue experimentPropertyToDelete) {
+        this.experimentPropertyToDelete = experimentPropertyToDelete;
+    }
+
     public void updateRemovedExperimentRoles() {
         UserExperimentRole userExperimentRole;
         for (UserInfo user : experimentUsers.keySet()) {
@@ -391,10 +558,23 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
                     }
             }
         }
+        
+        Iterator<ExperimentPolicy> iterator = experimentPolicyEditTable.getListDataModel().iterator();
+        while (iterator.hasNext()) {
+            experimentPolicyFacade.edit(iterator.next());
+        }
     
         clear();
         return super.update();
     }
+    
+    public String updateExperimentPolicy() {
+        ExperimentPolicy experimentPolicy = experimentPropertyToDelete.getExperimentPolicy();
+        experimentPolicy.getExperimentPolicyPropertyValueList().remove(experimentPropertyToDelete);
+        experimentPolicyFacade.edit(experimentPolicy);
+        clear();
+        return "edit?faces-redirect=true";        
+    }
 
    public String getRemovedUserName() {
         if (experimentUsersEditTable.getCurrentObject() != null) {
@@ -403,6 +583,13 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
         return "";
     }
         
+   public String getRemovedPolicyName() {
+       if (experimentPropertyToDelete != null) {
+            return experimentPropertyToDelete.getPolicyProperty().getName();
+       }
+       return "";
+    }
+        
     public String removeUser() {
         ExperimentUser experimentUser = experimentUsersEditTable.getCurrentObject();
         UserInfo user = experimentUser.getUser();
@@ -417,6 +604,10 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
         return "edit?faces-redirect=true";
     }
     
+    public void removePolicy() {
+        experimentPolicyPropertyValueFacade.remove(experimentPropertyToDelete);
+    }
+    
     public void removeUserRoles() {
         ExperimentUser experimentUser = experimentUsersEditTable.getCurrentObject();
         UserInfo user = experimentUser.getUser();

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/ExperimentTypeController.java

@@ -22,7 +22,7 @@ public class ExperimentTypeController extends CrudEntityController<ExperimentTyp
 {
 
     private static final Logger logger = Logger.getLogger(ExperimentTypeController.class.getName());
-    private int rows = 25;
+    private final int rows = 25;
 
     @EJB
     private ExperimentTypeFacade experimentTypeFacade;

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/PolicyPropertyController.java

@@ -10,7 +10,6 @@ import gov.anl.aps.dm.portal.exceptions.DmPortalException;
 import gov.anl.aps.dm.portal.exceptions.MissingProperty;
 import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
 import gov.anl.aps.dm.portal.model.beans.PolicyPropertyFacade;
-import gov.anl.aps.dm.portal.model.entities.AllowedPolicyValue;
 import gov.anl.aps.dm.portal.model.entities.PolicyProperty;
 import gov.anl.aps.dm.portal.model.entities.PolicyType;
 import java.util.List;
@@ -35,7 +34,7 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
 {
     
     private PolicyType policyType;
-    private int rows;
+    private int rows = 25;
 
     private static final Logger logger = Logger.getLogger(PolicyPropertyController.class.getName());
 
@@ -154,7 +153,6 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
     @Override
     public String prepareCreate() {
         super.prepareCreate();
-//        return "create?faces-redirect=true";
         return "/views/policyProperty/create?faces-redirect=true";
     }
     
@@ -180,7 +178,7 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
         clear();
         return view;
     }
-
+    
     public PolicyType getPolicyType() {
         return policyType;
     }
@@ -198,6 +196,15 @@ public class PolicyPropertyController extends CrudEntityController<PolicyPropert
     public void setRows(int rows) {
         this.rows = rows;
     }
+    
+    public boolean hasAllowedValues(PolicyProperty policyProperty) {
+        return ((policyProperty.getAllowedPolicyValueList() != null) && !policyProperty.getAllowedPolicyValueList().isEmpty());
+    }
+    
+    public String updateAllowedValueList() {
+        policyPropertyFacade.edit(current);
+        return "/views/policyProperty/edit?faces-redirect=true";
+    }
 
     @FacesConverter(forClass = PolicyProperty.class)
     public static class PolicyPropertyControllerConverter implements Converter

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

@@ -41,10 +41,10 @@ public class AllowedPolicyValue extends CloneableEntity
     @Basic(optional = false)
     @Column(name = "id")
     private Integer id;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "policy_value")
     private String policyValue;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @JoinColumn(name = "policy_property_id", referencedColumnName = "id")

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

@@ -39,10 +39,10 @@ public class AllowedSettingValue extends CloneableEntity
     @Basic(optional = false)
     @Column(name = "id")
     private Integer id;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "setting_value")
     private String settingValue;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @JoinColumn(name = "setting_type_id", referencedColumnName = "id")

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

@@ -48,10 +48,10 @@ public class DataFolder extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(min = 1, max = 2147483647)
+    @Size(min = 1, max = 1024)
     @Column(name = "data_path")
     private String dataPath;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @JoinTable(name = "experiment_data_folder", joinColumns = {

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

@@ -42,10 +42,10 @@ public class DataFolderPermission extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(min = 1, max = 2147483647)
+    @Size(max = 256)
     @Column(name = "permission_value")
     private String permissionValue;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @JoinColumn(name = "data_folder_id", referencedColumnName = "id")

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

@@ -55,7 +55,7 @@ public class Experiment extends CloneableEntity
     @Size(max = 64)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 2000)
     @Column(name = "description")
     private String description;
     @Column(name = "start_date")

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

@@ -45,12 +45,12 @@ public class ExperimentPolicyPropertyValue extends CloneableEntity
     @Column(name = "id")
     private Integer id;
     @Basic(optional = false)
-    @Size(min = 1, max = 2147483647)
+    @Size(max = 256)
     @Column(name = "policy_property_value")
     private String policyPropertyValue;
     @Basic(optional = false)
     @NotNull
-    @Size(min = 1, max = 2147483647)
+    @Size(max = 256)
     @Column(name = "modified_by")
     private String modifiedBy;
     @Basic(optional = false)
@@ -124,6 +124,10 @@ public class ExperimentPolicyPropertyValue extends CloneableEntity
     public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
+    
+    public String getUnits() {
+        return policyProperty.getUnits();
+    }
 
     @Override
     public int hashCode() {

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

@@ -48,10 +48,10 @@ public class ExperimentType extends CloneableEntity
     @Size(max = 64)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "root_data_path")
     private String rootDataPath;
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "experimentType")

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

@@ -49,22 +49,22 @@ public class PolicyProperty extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "units")
     private String units;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "lower_limit")
     private String lowerLimit;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "upper_limit")
     private String upperLimit;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "default_value")
     private String defaultValue;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @JoinColumn(name = "policy_type_id", referencedColumnName = "id")

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

@@ -45,10 +45,10 @@ public class PolicyType extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(min = 1, max = 2147483647)
+    @Size(max = 256)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "policyType")

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

@@ -49,10 +49,10 @@ public class RoleType extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 3000)
     @Column(name = "description")
     private String description;
     @NotNull

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

@@ -46,13 +46,13 @@ public class SettingType extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(min = 1, max = 2147483647)
+    @Size(max = 256)
     @Column(name = "name")
     private String name;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "default_value")
     private String defaultValue;
     @Column(name = "is_user_modifiable")

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

@@ -57,36 +57,36 @@ public class UserInfo extends CloneableEntity
     private Integer id;
     @Basic(optional = false)
     @NotNull
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "username")
     private String username;
     @Basic(optional = false)
     @NotNull
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "first_name")
     private String firstName;
     @Basic(optional = false)
     @NotNull
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "last_name")
     private String lastName;
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "middle_name")
     private String middleName;
     // @Pattern(regexp="[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?", message="Invalid email")//if the field contains email address consider using this annotation to enforce field validation
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "email")
     private String email;
-    @Size(max = 120)
+    @Size(max = 256)
     @Column(name = "badge")
     private String badge;
-    @Size(max = 120)
+    @Size(max = 256)
     @Column(name = "globus_username")
     private String globusUsername;
-    @Size(max = 120)
+    @Size(max = 256)
     @Column(name = "description")
     private String description;
-    @Size(max = 64)
+    @Size(max = 256)
     @Column(name = "password")
     private String password;
     @ManyToMany(mappedBy = "userInfoList")

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

@@ -38,7 +38,7 @@ public class UserSetting extends CloneableEntity
     @Basic(optional = false)
     @Column(name = "id")
     private Integer id;
-    @Size(max = 2147483647)
+    @Size(max = 256)
     @Column(name = "setting_value")
     private String settingValue;
     @JoinColumn(name = "user_id", referencedColumnName = "id")

src/java/DmWebPortal/web/resources/css/portal.css

@@ -182,6 +182,12 @@ a:link:hover, a:visited:hover  {
     float: left;
 }
 
+.entityDataTextShort {
+    font-weight: normal;
+    float: left;
+    width: 150px;
+}
+
 .entityDataEmphasizedText {
     font-weight: bold;
     font-size: 105%;

src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueDestroyDialog.xhtml

@@ -7,7 +7,8 @@
     <p:confirmDialog id="allowedPolicyValueDestroyDialog" message="Delete policy property #{allowedPolicyValueController.getCurrentEntityInstanceName()}?"
                      header="Delete Allowed Policy Value" severity="alert" widgetVar="allowedPolicyValueDestroyDialogWidget"
                      styleClass="dialog">
-        <p:commandButton value="Yes" oncomplete="allowedPolicyValueDestroyDialogWidget.hide()" action="#{allowedPolicyValueController.destroy()}" update="@form"/>
+        <ui:param name="deletedValue" value="#{allowedPolicyValueController.current}" />
+        <p:commandButton value="Yes" oncomplete="allowedPolicyValueDestroyDialogWidget.hide()" action="#{policyPropertyController.updateAllowedValueList()}" actionListener="#{allowedPolicyValueController.destroy()}" update="@form"/>
         <p:commandButton value="No" onclick="PF('allowedPolicyValueDestroyDialogWidget').hide()" type="button" />
     </p:confirmDialog>  
 </ui:composition>

src/java/DmWebPortal/web/views/allowedPolicyValue/allowedPolicyValueListDataTable.xhtml

@@ -41,12 +41,6 @@ and open the template in the editor.
             <h:outputText value="#{allowedPolicyValueViewObject.description}"/>
         </p:column>
 
-        <p:column headerText="Actions" >
-            <div class="actionLink">
-                <p:commandLink action="#{allowedPolicyValueController.prepareView(allowedPolicyValueViewObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
-                <p:commandLink action="#{allowedPolicyValueController.prepareEdit(allowedPolicyValueViewObject)}" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
-            </div>
-        </p:column>
     </p:dataTable>
 
 </ui:composition>