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

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.constants.RoleTypeName;
+import gov.anl.aps.dm.portal.model.beans.RoleTypeFacade;
+import gov.anl.aps.dm.portal.model.beans.UserInfoFacade;
+import gov.anl.aps.dm.portal.model.entities.UserInfo;
+import gov.anl.aps.dm.portal.utilities.CryptUtility;
+import gov.anl.aps.dm.portal.utilities.LdapUtility;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+import java.io.Serializable;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import javax.inject.Named;
+import org.apache.log4j.Logger;
+
+/**
+ * Login controller.
+ */
+@Named("loginController")
+@SessionScoped
+public class LoginController implements Serializable
+{
+
+    @EJB
+    private UserInfoFacade userInfoFacade;
+
+    @EJB
+    private RoleTypeFacade roleTypeFacade;
+    
+    private String username = null;
+    private String password = null;
+    private boolean loggedIn = false;
+    private UserInfo user = null;
+    private boolean isAdmin;
+
+    private static final Logger logger = Logger.getLogger(LoginController.class.getName());
+
+    /**
+     * Constructor.
+     */
+    public LoginController() {
+    }
+
+    /**
+     * Get password.
+     *
+     * @return login password
+     */
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Set password.
+     *
+     * @param password login password
+     */
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    /**
+     * Get username.
+     *
+     * @return login username
+     */
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * Set username.
+     *
+     * @param username login username
+     */
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    /**
+     * Check if user is logged in.
+     *
+     * @return true if admin is logged in, false otherwise
+     */
+    public boolean isLoggedIn() {
+        return loggedIn;
+    }
+
+    /**
+     * Login action.
+     *
+     * @return url to service home page if login is successful, or null in case
+     * of errors
+     */
+    public String login() {
+        loggedIn = false;
+        if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
+           SessionUtility.addWarningMessage(null, "Incomplete Input. Please enter both username and password.");
+           return (username = password = null);
+        }
+
+        user = userInfoFacade.findByUsername(username);
+        if (user == null) {
+            SessionUtility.addErrorMessage(null, "Username " + username + " is not registered. Contact administrator.");
+            return (username = password = null);
+        }
+
+        boolean validCredentials = false;
+        if (user.getPassword() != null && CryptUtility.verifyPasswordWithPbkdf2(password, user.getPassword())) {
+            logger.debug("User " + username + " is authorized by DM DB");
+            validCredentials = true;
+        }
+        else if (LdapUtility.validateCredentials(username, password)) {
+            logger.debug("User " + username + " is authorized by DM LDAP");
+            validCredentials = true;
+        }
+        else {
+            logger.debug("User " + username + " is not authorized.");
+        }
+
+        if (validCredentials) {
+            SessionUtility.setUser(user);
+
+            loggedIn = true;
+            SessionUtility.addInfoMessage("Successful Login", "User " + username + " is logged in.");
+            isAdmin = roleTypeFacade.findByName(RoleTypeName.ADMIN).isAdmin(username);
+            return getLandingPage();
+        }
+        else {
+             SessionUtility.addErrorMessage(null, "Invalid Credentials. Username/password combination could not be verified.");
+             SessionUtility.addErrorMessage(null, "If you are having difficulty logging in, please see our <a href=\"/dm/views/loginHelp.xhtml\">login help</a> page.");
+            return (username = password = null);
+        }
+
+    }
+    
+    public String getLandingPage() {
+        String landingPage = SessionUtility.getCurrentViewId() + "?faces-redirect=true";
+        if (landingPage.contains("login")) {
+            landingPage = "/views/home?faces-redirect=true";
+        }
+        logger.debug("Landing page: " + landingPage);
+        return landingPage;
+    }
+    
+    public String displayUsername() {
+        if (isLoggedIn()) {
+            return username;
+        }
+        else {
+            return "Not Logged In";
+        }
+    }
+
+    public boolean isUserWriteable(UserInfo user) {
+        if (!isLoggedIn()) {
+            return false;
+        }
+        return isLoggedIn() || this.user.getId() == user.getId();
+    }
+
+    /**
+     * Logout action.
+     *
+     * @return url to logout page
+     */
+    public String logout() {
+        SessionUtility.clearSession();
+        ExternalContext context = FacesContext.getCurrentInstance().getExternalContext();
+        context.invalidateSession();
+        loggedIn = false;
+        user = null;
+        return "/views/login?faces-redirect=true";
+    }
+
+        public boolean isAdmin() {
+            return isAdmin;
+    }
+
+
+}

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

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.controllers;
+
+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.PolicyProperty;
+import gov.anl.aps.dm.portal.model.entities.PolicyType;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.inject.Named;
+import org.apache.log4j.Logger;
+
+/**
+ *
+ * @author bfrosik
+ */
+@Named("policyPropertyController")
+@SessionScoped
+public class PolicyPropertyController extends CrudEntityController<PolicyProperty, PolicyPropertyFacade>
+{
+    
+    private PolicyType policyType;
+    private int rows = 25;
+
+    private static final Logger logger = Logger.getLogger(PolicyPropertyController.class.getName());
+
+    @EJB
+    private PolicyPropertyFacade policyPropertyFacade;
+
+    class PolicyPropertyInfoTable extends DataTableController<PolicyProperty> {
+
+        @Override
+        public String getClassName() {
+            return "PolicyProperty";
+        }
+
+        @Override
+        public List<PolicyProperty> findAll() {
+            return policyPropertyFacade.findByPolicyTypeId(policyType.getId());
+        }
+    }
+    
+    private PolicyPropertyInfoTable policyPropertyInfoTable = new PolicyPropertyInfoTable();
+
+    public PolicyPropertyController() {
+    }
+
+    public PolicyPropertyInfoTable getPolicyPropertyInfoTable() {
+        return policyPropertyInfoTable;
+    }
+
+    public void setPolicyPropertyInfoTable(PolicyPropertyInfoTable policyPropertyInfoTable) {
+        this.policyPropertyInfoTable = policyPropertyInfoTable;
+    }
+
+    @Override
+    protected PolicyPropertyFacade getFacade() {
+        return policyPropertyFacade;
+    }
+
+    @Override
+    protected PolicyProperty createEntityInstance() {
+        return new PolicyProperty();
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getName();
+        }
+        return "";
+    }
+
+    @Override
+    public DataModel createListDataModel() {
+        return new ListDataModel((List) policyPropertyFacade.findByPolicyTypeId(policyType.getId()));
+    }
+
+    @Override
+    public List<PolicyProperty> getAvailableItems() {
+        return (List<PolicyProperty>) policyPropertyFacade.findByPolicyTypeId(policyType.getId());
+    }
+
+    @Override
+    public String prepareEdit(PolicyProperty policyProperty) {
+        super.prepareEdit(policyProperty);
+        return "/views/policyProperty/edit?faces-redirect=true";
+    }
+
+    @Override
+    public String prepareView(PolicyProperty policyProperty) {
+        super.prepareView(policyProperty);
+        return "/views/policyProperty/view?faces-redirect=true";
+    }
+
+    public String prepareView() {
+        return super.prepareView(current);
+    }
+
+    @Override
+    public void prepareEntityInsert(PolicyProperty policyProperty) throws ObjectAlreadyExists, MissingProperty {
+        current.setPolicyType(policyType);
+        if ((policyProperty.getName() == null) || (policyProperty.getName().length() == 0)) {
+            throw new MissingProperty("Name is missing.");
+        }
+        List<PolicyProperty> policyPropertyList = policyPropertyFacade.findByPolicyTypeId(policyType.getId());
+        for (PolicyProperty property : policyPropertyList) {
+            if ((property.getName().equals(policyProperty.getName()))) {
+                throw new ObjectAlreadyExists("policy property " + policyProperty.getName() + " already exists for this policy type.");
+            }
+        }
+        logger.debug("Inserting new policy property " + policyProperty.getName());
+    }
+
+    @Override
+    public void prepareEntityUpdate(PolicyProperty policyProperty) throws DmPortalException {       
+        current.setPolicyType(policyType);
+    }
+    
+     @Override
+     protected String getObjectAlreadyExistMessage(PolicyProperty policyProperty)  {
+        if (policyProperty == null) {
+            return null;
+        }
+        return "Policy Property " + policyProperty.getName() + " already exists."; 
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "PolicyProperty";
+    }
+    
+    @Override
+    public void clear() {
+        policyPropertyInfoTable.resetList();
+        resetList();
+    }
+
+    @Override
+    public String prepareCreate() {
+        super.prepareCreate();
+        return "/views/policyProperty/create?faces-redirect=true";
+    }
+    
+    @Override
+    public String create() {
+        if (super.create() == null) {
+            return null;
+        }
+        policyPropertyInfoTable.resetList();
+        return "/views/policyType/view?faces-redirect=true";
+    }
+    
+    @Override
+    public String prepareList() {
+        logger.debug("Preparing list");
+        resetListDataModel();
+        return "/views/policyType/view?faces-redirect=true";
+    }
+    
+    @Override
+    public String destroy() {
+        String view = super.destroy();
+        clear();
+        return view;
+    }
+    
+    public PolicyType getPolicyType() {
+        return policyType;
+    }
+
+    public void setPolicyType(PolicyType policyType) {
+        logger.info("setting policy type ");
+        clear();
+        this.policyType = policyType;
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    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";
+    }
+    
+    public boolean notSelected() {
+        return current == null;
+    }
+    
+    @FacesConverter(forClass = PolicyProperty.class)
+    public static class PolicyPropertyControllerConverter implements Converter
+    {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            PolicyPropertyController controller = (PolicyPropertyController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "policyPropertyController");
+            return controller.getEntity(getKey(value));
+        }
+
+        java.lang.Integer getKey(String value) {
+            java.lang.Integer key;
+            key = Integer.valueOf(value);
+            return key;
+        }
+
+        String getStringKey(java.lang.Integer value) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(value);
+            return sb.toString();
+        }
+
+        @Override
+        public String getAsString(FacesContext facesContext, UIComponent component, Object object) {
+            if (object == null) {
+                return null;
+            }
+            if (object instanceof PolicyProperty) {
+                PolicyProperty o = (PolicyProperty) object;
+                return getStringKey(o.getId());
+            }
+            else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + PolicyProperty.class.getName());
+            }
+        }
+    }
+
+}
\ No newline at end of file

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

+package gov.anl.aps.dm.portal.controllers;
+
+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.entities.PolicyType;
+import gov.anl.aps.dm.portal.model.beans.PolicyTypeFacade;
+import java.util.List;
+
+import javax.ejb.EJB;
+import javax.inject.Named;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import org.apache.log4j.Logger;
+
+@Named("policyTypeController")
+@SessionScoped
+public class PolicyTypeController extends CrudEntityController<PolicyType, PolicyTypeFacade>
+{
+
+    private static final Logger logger = Logger.getLogger(PolicyTypeController.class.getName());
+
+    @EJB
+    private PolicyTypeFacade policyTypeFacade;
+
+    public PolicyTypeController() {
+    }
+
+    @Override
+    protected PolicyTypeFacade getFacade() {
+        return policyTypeFacade;
+    }
+
+    @Override
+    protected PolicyType createEntityInstance() {
+        return new PolicyType();
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "policyType";
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getName();
+        }
+        return "";
+    }
+
+    @Override
+    public List<PolicyType> getAvailableItems() {
+        return super.getAvailableItems();
+    }
+
+    @Override
+    public String prepareEdit(PolicyType policyType) {
+        return super.prepareEdit(policyType);
+    }
+
+    @Override
+    public void prepareEntityInsert(PolicyType policyType) throws ObjectAlreadyExists, MissingProperty {
+        if ((policyType.getName() == null) || (policyType.getName().length() == 0)) {
+            throw new MissingProperty("Name is missing.");
+        }
+        PolicyType existingPolicyType = policyTypeFacade.findByName(policyType.getName());
+        if (existingPolicyType != null) {
+            throw new ObjectAlreadyExists("Experiment type " + policyType.getName() + " already exists.");
+        }
+        logger.debug("Inserting new experiment type " + policyType.getName());
+    }
+
+    @Override
+    public void prepareEntityUpdate(PolicyType policyType) throws DmPortalException {
+        if ((policyType.getName() == null) || (policyType.getName().length() == 0)) {
+            throw new MissingProperty("Name is missing.");
+        }
+    }
+    
+     @Override
+     protected String getObjectAlreadyExistMessage(PolicyType policyType)  {
+        if (policyType == null) {
+            return null;
+        }
+        return "Experiment Policy " + policyType.getName() + " already exists."; 
+    }
+     
+     public String prepareView() {
+         return super.prepareView(current);
+     }
+
+    public boolean notSelected() {
+        return current == null;
+    }
+    
+    @FacesConverter(forClass = PolicyType.class)
+    public static class PolicyTypeControllerConverter implements Converter
+    {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            PolicyTypeController controller = (PolicyTypeController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "policyTypeController");
+            return controller.getEntity(getKey(value));
+        }
+
+        java.lang.Integer getKey(String value) {
+            java.lang.Integer key;
+            key = Integer.valueOf(value);
+            return key;
+        }
+
+        String getStringKey(java.lang.Integer value) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(value);
+            return sb.toString();
+        }
+
+        @Override
+        public String getAsString(FacesContext facesContext, UIComponent component, Object object) {
+            if (object == null) {
+                return null;
+            }
+            if (object instanceof PolicyType) {
+                PolicyType o = (PolicyType) object;
+                return getStringKey(o.getId());
+            }
+            else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + PolicyType.class.getName());
+            }
+        }
+    }
+
+}
\ No newline at end of file

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

+package gov.anl.aps.dm.portal.controllers;
+
+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.RoleTypeFacade;
+import gov.anl.aps.dm.portal.model.entities.RoleType;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import javax.inject.Named;
+import org.apache.log4j.Logger;
+
+@Named("roleTypeController")
+@SessionScoped
+public class RoleTypeController extends CrudEntityController<RoleType, RoleTypeFacade>
+{
+    private static final Logger logger = Logger.getLogger(RoleTypeController.class.getName());
+    private final int rows = 25;
+
+    @EJB
+    private RoleTypeFacade roleTypeFacade;
+
+    public RoleTypeController() {
+    }
+    
+    public int getRows() {
+        return rows;
+    }
+ 
+    @Override
+    protected RoleTypeFacade getFacade() {
+        return roleTypeFacade;
+    }
+
+    @Override
+    protected RoleType createEntityInstance() {
+        return new RoleType();
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "roleType";
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getName();
+        }
+        return "";
+    }
+
+    @Override
+    public List<RoleType> getAvailableItems() {
+        return super.getAvailableItems();
+    }
+
+    @Override
+    public String prepareEdit(RoleType roleType) {
+        return super.prepareEdit(roleType);
+    }
+
+    @Override
+    public void prepareEntityInsert(RoleType roleType) throws ObjectAlreadyExists, MissingProperty {
+        if ((roleType.getName() == null) || (roleType.getName().length() == 0)) {
+            throw new MissingProperty("Name is missing.");
+        }
+        RoleType existingRoleType = roleTypeFacade.findByName(roleType.getName());
+        if (existingRoleType != null) {
+            throw new ObjectAlreadyExists("Role Type " + roleType.getName() + " already exists.");
+        }
+        logger.debug("Inserting new roleType " + roleType.getName());
+    }
+
+    @Override
+    public void prepareEntityUpdate(RoleType roleType) throws DmPortalException {
+         if ((roleType.getName() == null) || (roleType.getName().length() == 0)) {
+            throw new MissingProperty("Name is missing.");
+        }
+   }
+
+     @Override
+     protected String getObjectAlreadyExistMessage(RoleType roleType)  {
+        if (roleType == null) {
+            return null;
+        }
+        return "Role Type " + roleType.getName() + " already exists."; 
+    }
+
+
+    public boolean isRoleSystemType(RoleType roleType) {
+        if (roleType == null) {
+            logger.warn("Current row is not set");
+            // Do nothing if current item is not set.
+            return false;
+        }
+
+        return roleType.isIsSystemRole();
+    }
+
+    public boolean notSelected() {
+        return current == null;
+    }
+    
+    @FacesConverter(forClass = RoleType.class)
+    public static class RoleTypeControllerConverter implements Converter {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            RoleTypeController controller = (RoleTypeController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "roleTypeController");
+            return controller.getEntity(getKey(value));
+        }
+
+        java.lang.Integer getKey(String value) {
+            java.lang.Integer key;
+            key = Integer.valueOf(value);
+            return key;
+        }
+
+        String getStringKey(java.lang.Integer value) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(value);
+            return sb.toString();
+        }
+
+        @Override
+        public String getAsString(FacesContext facesContext, UIComponent component, Object object) {
+            if (object == null) {
+                return null;
+            }
+            if (object instanceof RoleType) {
+                RoleType o = (RoleType) object;
+                return getStringKey(o.getId());
+            }
+            else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + RoleType.class.getName());
+            }
+        }
+
+    }
+
+}
\ No newline at end of file

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

+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.constants.RoleTypeName;
+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.RoleTypeFacade;
+import gov.anl.aps.dm.portal.model.entities.UserInfo;
+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.Experiment;
+import gov.anl.aps.dm.portal.model.entities.RoleType;
+import gov.anl.aps.dm.portal.utilities.CryptUtility;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+import java.util.List;
+import java.util.Map;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.FacesConverter;
+import javax.inject.Named;
+import org.apache.log4j.Logger;
+
+@Named("userInfoController")
+@SessionScoped
+public class UserInfoController extends CrudEntityController<UserInfo, UserInfoFacade> {
+
+    private static final Logger logger = Logger.getLogger(UserInfoController.class.getName());
+    private final int rows = 25;
+
+    @EJB
+    private UserInfoFacade userInfoFacade;
+
+    @EJB
+    private RoleTypeFacade roleTypeFacade;
+
+    private String passwordEntry = null;
+
+    public class ExperimentUser extends CloneableEntity {
+
+        String experimentName;
+        String description;
+        int userId;
+        int experimentId;
+        private final boolean[] userRoles;
+
+        public ExperimentUser(int experimentId, int userId) {
+            userRoles = new boolean[maxExperimentRoleTypeId + 1];
+            this.experimentId = experimentId;
+            this.userId = userId;
+        }
+
+        void setExperimentName(String experimentName) {
+            this.experimentName = experimentName;
+        }
+
+        void setDescription(String description) {
+            this.description = description;
+        }
+
+        public String getExperimentName() {
+            return experimentName;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public boolean isIsManager() {
+            return userRoles[experimentRoles.get(RoleTypeName.MANAGER).getId()];
+        }
+
+        public boolean isIsPI() {
+            return userRoles[experimentRoles.get(RoleTypeName.PI).getId()];
+        }
+
+        public boolean isIsUser() {
+            return userRoles[experimentRoles.get(RoleTypeName.USER).getId()];
+        }
+
+        public void setIsInRole(RoleType role, boolean isInRole) {
+            userRoles[role.getId()] = isInRole;
+        }
+
+        public boolean[] getRoles() {
+            return userRoles;
+        }
+
+        @Override
+        public int hashCode() {
+            return userId + experimentId * 100;
+        }
+
+        @Override
+        public boolean equals(Object object) {
+            // TODO: Warning - this method won't work in the case the id fields are not set
+            if (!(object instanceof ExperimentUser)) {
+                return false;
+            }
+            return ((userId == ((ExperimentUser) object).userId) && (experimentId == ((ExperimentUser) object).experimentId));
+        }
+    }
+
+    class UserExperimentsTable extends DataTableController<ExperimentUser> {
+
+        @Override
+        public String getClassName() {
+            return "UserExperiments";
+        }
+
+        @Override
+        public List<ExperimentUser> findAll() {
+            List<Experiment> list = userInfoFacade.findExperimentsInUser(getCurrent().getId());
+            return convertUserExperiments(list);
+        }
+
+        List<ExperimentUser> convertUserExperiments(List<Experiment> list) {
+            if (!initialized) {
+                initializeRoleTypes();
+            }
+            userExperiments.clear();
+            logger.debug("converting UserExperiments ");
+            Collection<RoleType> roleTypes;
+            roleTypes = experimentRoles.values();
+            ExperimentUser experimentUser;
+            for (Experiment experiment : list) {
+                experimentUser = new ExperimentUser(experiment.getId(), getCurrent().getId());
+                experimentUser.setExperimentName(experiment.getName());
+                experimentUser.setDescription(experiment.getDescription());
+                userExperiments.add(experimentUser);
+                for (RoleType roleType : roleTypes) {
+                    boolean inRole = (getCurrent().getExperimentRole(roleType.getId(), experiment.getId()) != null);
+                    experimentUser.setIsInRole(roleType, inRole);
+                }
+            }
+            return userExperiments;
+        }
+
+        @Override
+        public String getTableName() {
+            return "UserExperimentsTable";
+        }
+    }
+
+    private UserInfoController.UserExperimentsTable userExperimentsListTable = new UserInfoController.UserExperimentsTable();
+
+    private final List<ExperimentUser> userExperiments = new ArrayList<>();
+    private final Map<String, RoleType> experimentRoles = new HashMap<>();
+    int maxExperimentRoleTypeId;
+    boolean initialized = false;
+
+    public UserInfoController() {
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    private void initializeRoleTypes() {
+        List<RoleType> roleTypesList = roleTypeFacade.findAll();
+        for (RoleType roleType : roleTypesList) {
+            if (!roleType.isIsSystemRole()) {
+                experimentRoles.put(roleType.getName(), roleType);
+                if (roleType.getId() > maxExperimentRoleTypeId) {
+                    maxExperimentRoleTypeId = roleType.getId();
+                }
+            }
+        }
+        initialized = true;
+    }
+
+    @Override
+    public void clear() {
+        userExperimentsListTable.resetList();
+        userExperiments.clear();
+    }
+
+    public UserExperimentsTable getUserExperimentsListTable() {
+        return userExperimentsListTable;
+    }
+
+    public void setUserExperimentsListTable(UserExperimentsTable userExperimentsListTable) {
+        this.userExperimentsListTable = userExperimentsListTable;
+    }
+
+    @Override
+    protected UserInfoFacade getFacade() {
+        return userInfoFacade;
+    }
+
+    @Override
+    protected UserInfo createEntityInstance() {
+        return new UserInfo();
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "userInfo";
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getUsername();
+        }
+        return "";
+    }
+
+    @Override
+    public List<UserInfo> getAvailableItems() {
+        return super.getAvailableItems();
+    }
+
+    @Override
+    public String prepareEdit(UserInfo user) {
+        passwordEntry = null;
+        return super.prepareEdit(user);
+    }
+
+    @Override
+    public void prepareEntityInsert(UserInfo user) throws ObjectAlreadyExists, MissingProperty {
+        verifyMandatoryParam(user);
+        UserInfo existingUser = userInfoFacade.findByUsername(user.getUsername());
+        if (existingUser != null) {
+            throw new ObjectAlreadyExists("User " + user.getUsername() + " already exists.");
+        }
+        if (passwordEntry != null && !passwordEntry.isEmpty()) {
+            logger.debug("Will crypt provided password for user " + user.getUsername());
+            String cryptedPassword = CryptUtility.cryptPasswordWithPbkdf2(passwordEntry);
+            user.setPassword(cryptedPassword);
+        }
+        passwordEntry = null;
+        logger.debug("Inserting new user " + user.getUsername());
+    }
+
+    private void verifyMandatoryParam(UserInfo user) throws MissingProperty {
+        int missing = 0;
+        if ((user.getUsername() == null) || (user.getUsername().length() == 0)) {
+            missing = 1;
+        }
+        if ((user.getLastName() == null) || (user.getLastName().length() == 0)) {
+            missing += 2;
+        }
+        if ((user.getFirstName() == null) || (user.getFirstName().length() == 0)) {
+            missing += 4;
+        }
+        if (missing > 0) {
+            switch (missing) {
+                case 7:
+                    throw new MissingProperty("Username, last name, and first name are missing.");
+                case 6:
+                    throw new MissingProperty("last name, and first name are missing.");
+                case 5:
+                    throw new MissingProperty("Username and first name are missing.");
+                case 4:
+                    throw new MissingProperty("first name is missing.");
+                case 3:
+                    throw new MissingProperty("Username and last name are missing.");
+                case 2:
+                    throw new MissingProperty("last name is missing.");
+                case 1:
+                    throw new MissingProperty("Username is missing.");
+            }
+        }
+    }
+
+    @Override
+    public void prepareEntityUpdate(UserInfo user) throws DmPortalException {
+        verifyMandatoryParam(user);
+        if (passwordEntry != null && !passwordEntry.isEmpty()) {
+            logger.debug("Will crypt provided password for user " + user.getUsername());
+            String cryptedPassword = CryptUtility.cryptPasswordWithPbkdf2(passwordEntry);
+            user.setPassword(cryptedPassword);
+        }
+        passwordEntry = null;
+    }
+
+    @Override
+    protected String getObjectAlreadyExistMessage(UserInfo user) {
+        if (user == null) {
+            return null;
+        }
+        return "User " + user.getUsername() + " already exists.";
+    }
+
+    public String prepareSessionUserEdit(String viewPath) {
+        UserInfo sessionUser = (UserInfo) SessionUtility.getUser();
+        if (sessionUser == null) {
+            return null;
+        }
+        prepareEdit(sessionUser);
+        return viewPath + "?faces-redirect=true";
+    }
+
+    public String getPasswordEntry() {
+        return passwordEntry;
+    }
+
+    public void setPasswordEntry(String passwordEntry) {
+        this.passwordEntry = passwordEntry;
+    }
+
+    public boolean notSelected() {
+        return current == null;
+    }
+
+    @FacesConverter(forClass = UserInfo.class)
+    public static class UserInfoControllerConverter implements Converter {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            UserInfoController controller = (UserInfoController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "userInfoController");
+            return controller.getEntity(getKey(value));
+        }
+
+        java.lang.Integer getKey(String value) {
+            java.lang.Integer key;
+            key = Integer.valueOf(value);
+            return key;
+        }
+
+        String getStringKey(java.lang.Integer value) {
+            StringBuilder sb = new StringBuilder();
+            sb.append(value);
+            return sb.toString();
+        }
+
+        @Override
+        public String getAsString(FacesContext facesContext, UIComponent component, Object object) {
+            if (object == null) {
+                return null;
+            }
+            if (object instanceof UserInfo) {
+                UserInfo o = (UserInfo) object;
+                return getStringKey(o.getId());
+            } else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + UserInfo.class.getName());
+            }
+        }
+
+    }
+
+}

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

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.model.beans.RoleTypeFacade;
+import gov.anl.aps.dm.portal.model.beans.UserInfoFacade;
+import gov.anl.aps.dm.portal.model.entities.RoleType;
+import gov.anl.aps.dm.portal.model.entities.UserInfo;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+import java.io.Serializable;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
+import org.apache.log4j.Logger;
+
+@Named("userSystemRoleController")
+@SessionScoped
+public class UserSystemRoleController  implements Serializable
+{
+ 
+    @EJB
+    private UserInfoFacade userInfoFacade;
+
+    @EJB
+    private RoleTypeFacade roleTypeFacade;
+    
+    private int rows = 25;
+
+    class SystemRoleTypeTable extends DataTableController<UserInfo> {
+       @Override
+        public String getClassName() {
+            return "UserInfo";
+        }
+
+        @Override
+        public List<UserInfo> findAll() {
+            return userInfoFacade.findSystemRoleUsers(systemRole.getId());
+        }
+    }
+    
+    class NoSystemRoleTypeTable extends DataTableController<UserInfo> {
+
+        @Override
+        public String getClassName() {
+            return "UserInfo";
+        }
+
+        @Override
+        public List<UserInfo> findAll() {
+            return userInfoFacade.findNoSystemRoleUsers(systemRole.getId());
+        }
+        
+    }
+    
+    private SystemRoleTypeTable systemRoleTable;
+    private NoSystemRoleTypeTable noSystemRoleTable;
+
+    private RoleType systemRole;
+
+    private static final Logger logger = Logger.getLogger(UserSystemRoleController.class.getName());
+    
+    public UserSystemRoleController() {
+        this.systemRoleTable = new SystemRoleTypeTable();
+        this.noSystemRoleTable = new NoSystemRoleTypeTable();
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    public RoleType getSystemRole() {
+        return systemRole;
+    }
+
+    public void setSystemRole(RoleType systemRole) {
+        this.systemRole = systemRole;
+    }
+
+    public SystemRoleTypeTable getSystemRoleTable() {
+        return systemRoleTable;
+    }
+
+    public void setSystemRoleTable(SystemRoleTypeTable systemRoleTable) {
+        this.systemRoleTable = systemRoleTable;
+    }
+
+     public NoSystemRoleTypeTable getNoSystemRoleTable() {
+        return noSystemRoleTable;
+    }
+
+    public void setNoSystemRoleTable(NoSystemRoleTypeTable noSystemRoleTable) {
+        this.noSystemRoleTable = noSystemRoleTable;
+    }
+         
+    public String getSystemRoleName() {
+        return systemRole.getName(); 
+    }
+
+     public String resetSystemRoleUserList() {
+        logger.debug("Resetting System Role User list");
+        systemRoleTable.resetList();
+        return "/views/userSystemRole/list?faces-redirect=true";
+    }
+    
+     public void resetNoSystemRoleUserList() {
+        logger.debug("Resetting System Role Add User list");
+        noSystemRoleTable.resetList();
+    }
+     
+    public String prepareSystemRoleView() {
+        logger.debug("Preparing system role view");
+        noSystemRoleTable.resetList();
+        return resetSystemRoleUserList();
+    }
+
+    public String addSystemRole() {
+        List<UserInfo> uiList = noSystemRoleTable.getSelectedObjectList();
+
+        if (uiList == null) {
+            logger.debug("null selected list");
+        } else if (uiList.isEmpty()) {
+            logger.debug("empty selected list");
+        } else {
+            for (UserInfo userInfo : uiList) {
+                systemRole.addRoleTypeToUser(userInfo);
+            }
+        }
+        try {
+            roleTypeFacade.edit(systemRole);
+            resetNoSystemRoleUserList();
+            return resetSystemRoleUserList();
+        } catch (RuntimeException ex) {
+            SessionUtility.addErrorMessage("Error", "Could not update RoleType" + ": " + ex.getMessage());
+            return null;
+        }
+    }
+
+    public String removeSystemRole() {
+        logger.debug("removing system role from user");
+        systemRole.removeRoleTypeFromUser(systemRoleTable.currentObject);
+        try {
+        roleTypeFacade.edit(systemRole);
+        resetNoSystemRoleUserList();
+        return resetSystemRoleUserList();
+        }
+        catch (RuntimeException ex) {
+            SessionUtility.addErrorMessage("Error", "Could not update RoleType" + ": " + ex.getMessage());
+            return null;
+        }        
+     }
+
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/exceptions/DmPortalException.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.exceptions;
+
+import gov.anl.aps.dm.portal.constants.DmStatus;
+
+
+/**
+ * Generic DAQ exception.
+ */
+public class DmPortalException extends Exception
+{
+
+    /**
+     * Exception signature key.
+     */
+    public static final String SignatureKey = "__dm_portal_exception__";
+
+    /**
+     * Exception type key.
+     */
+    public static final String TypeKey = "type";
+
+    /**
+     * Exception code key.
+     */
+    public static final String CodeKey = "code";
+
+    /**
+     * Exception args key.
+     */
+    public static final String ArgsKey = "args";
+
+    /**
+     * Error code.
+     */
+    private int errorCode = DmStatus.DM_ERROR;
+
+
+    /**
+     * Error message. 
+     */
+    private String error = null;
+
+    /**
+     * Constructor.
+     */
+    public DmPortalException() 
+    {
+        super();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     */
+    public DmPortalException(String message) 
+    {
+        super(message);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     * @param errorCode Error code
+     */
+    public DmPortalException(String message, int errorCode) 
+    {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param throwable Throwable object
+     */
+    public DmPortalException(Throwable throwable) 
+    {
+        super(throwable);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     * @param throwable Throwable object
+     */
+    public DmPortalException(String message, Throwable throwable) 
+    {
+        super(message, throwable);
+    }
+
+    /**
+     * Set error code.
+     * 
+     * @param errorCode Error code
+     */
+    public void setErrorCode(int errorCode) 
+    {
+        this.errorCode = errorCode;
+    }
+
+    /**
+     * Get error code.
+     * 
+     * @return Error code
+     */
+    public int getErrorCode() 
+    {
+        return errorCode;
+    }
+
+    /**
+     * Set error message.
+     * 
+     * @param error Error message
+     */
+    public void setErrorMessage(String error) 
+    {
+        this.error = error;
+    }
+
+    /**
+     * Get error message.
+     * 
+     * @return Error message
+     */
+    public String getErrorMessage() 
+    {
+        return error;
+    }
+
+    /**
+     * Override string output if error message is set.
+     * 
+     * @return error message
+     */
+    @Override
+    public String toString() 
+    {
+        if(error != null) {
+            return error;
+        }
+        else {
+            return super.toString();
+        }
+    }
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/exceptions/InvalidDate.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.exceptions;
+
+
+import gov.anl.aps.dm.portal.constants.DmStatus;
+
+/**
+ * Object already exists exception class.
+ */
+public class InvalidDate extends DmPortalException 
+{
+
+    /**
+     * Constructor.
+     */
+    public InvalidDate() 
+    {
+        super();
+        setErrorCode(DmStatus.DM_INVALID_DATE);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     */
+    public InvalidDate(String message) 
+    {
+        super(message);
+        setErrorCode(DmStatus.DM_INVALID_DATE);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param throwable Throwable object
+     */
+    public InvalidDate(Throwable throwable) 
+    {
+        super(throwable);
+        setErrorCode(DmStatus.DM_INVALID_DATE);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     * @param throwable Throwable object
+     */
+    public InvalidDate(String message, Throwable throwable) 
+    {
+        super(message, throwable);
+        setErrorCode(DmStatus.DM_INVALID_DATE);
+    }
+
+}
\ No newline at end of file

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/exceptions/MissingProperty.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.exceptions;
+
+import gov.anl.aps.dm.portal.constants.DmStatus;
+
+/**
+ *
+ * @author bfrosik
+ */
+public class MissingProperty extends DmPortalException
+{
+    /**
+     * Constructor.
+     */
+    public MissingProperty() 
+    {
+        super();
+        setErrorCode(DmStatus.DM_MISSING_PROPERTY);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     */
+    public MissingProperty(String message) 
+    {
+        super(message);
+        setErrorCode(DmStatus.DM_MISSING_PROPERTY);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param throwable Throwable object
+     */
+    public MissingProperty(Throwable throwable) 
+    {
+        super(throwable);
+        setErrorCode(DmStatus.DM_MISSING_PROPERTY);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     * @param throwable Throwable object
+     */
+    public MissingProperty(String message, Throwable throwable) 
+    {
+        super(message, throwable);
+        setErrorCode(DmStatus.DM_MISSING_PROPERTY);
+    }
+}
+

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/exceptions/ObjectAlreadyExists.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.exceptions;
+
+
+import gov.anl.aps.dm.portal.constants.DmStatus;
+
+/**
+ * Object already exists exception class.
+ */
+public class ObjectAlreadyExists extends DmPortalException 
+{
+
+    /**
+     * Constructor.
+     */
+    public ObjectAlreadyExists() 
+    {
+        super();
+        setErrorCode(DmStatus.DM_OBJECT_ALREADY_EXISTS);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     */
+    public ObjectAlreadyExists(String message) 
+    {
+        super(message);
+        setErrorCode(DmStatus.DM_OBJECT_ALREADY_EXISTS);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param throwable Throwable object
+     */
+    public ObjectAlreadyExists(Throwable throwable) 
+    {
+        super(throwable);
+        setErrorCode(DmStatus.DM_OBJECT_ALREADY_EXISTS);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param message Error message
+     * @param throwable Throwable object
+     */
+    public ObjectAlreadyExists(String message, Throwable throwable) 
+    {
+        super(message, throwable);
+        setErrorCode(DmStatus.DM_OBJECT_ALREADY_EXISTS);
+    }
+
+}
\ No newline at end of file

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/AbstractFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import java.util.List;
+import javax.persistence.EntityManager;
+
+/**
+ *
+ * @author sveseli
+ */
+public abstract class AbstractFacade<T>
+{
+    private Class<T> entityClass;
+
+    public AbstractFacade(Class<T> entityClass) {
+        this.entityClass = entityClass;
+    }
+
+    protected abstract EntityManager getEntityManager();
+
+    public void create(T entity) {
+        getEntityManager().persist(entity);
+    }
+
+    public T edit(T entity) {
+        return getEntityManager().merge(entity);
+    }    
+
+    public void remove(T entity) {
+        getEntityManager().remove(getEntityManager().merge(entity));
+    }
+
+    public T find(Object id) {
+        return getEntityManager().find(entityClass, id);
+    }
+
+    public List<T> findAll() {
+        javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
+        cq.select(cq.from(entityClass));
+        return getEntityManager().createQuery(cq).getResultList();
+    }
+
+    public List<T> findRange(int[] range) {
+        javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
+        cq.select(cq.from(entityClass));
+        javax.persistence.Query q = getEntityManager().createQuery(cq);
+        q.setMaxResults(range[1] - range[0] + 1);
+        q.setFirstResult(range[0]);
+        return q.getResultList();
+    }
+
+    public int count() {
+        javax.persistence.criteria.CriteriaQuery cq = getEntityManager().getCriteriaBuilder().createQuery();
+        javax.persistence.criteria.Root<T> rt = cq.from(entityClass);
+        cq.select(getEntityManager().getCriteriaBuilder().count(rt));
+        javax.persistence.Query q = getEntityManager().createQuery(cq);
+        return ((Long) q.getSingleResult()).intValue();
+    }
+    
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/AllowedPolicyValueFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.AllowedPolicyValue;
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class AllowedPolicyValueFacade extends AbstractFacade<AllowedPolicyValue>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public AllowedPolicyValueFacade() {
+        super(AllowedPolicyValue.class);
+    }
+    
+    public AllowedPolicyValue findByName(String name) {
+        try {
+            return (AllowedPolicyValue) em.createNamedQuery("AllowedPolicyValue.findByPolicyValue")
+                    .setParameter("policyValue", name)
+                    .getSingleResult();
+        } catch (NoResultException ex) {
+        }
+        return null;
+    }
+
+    public AllowedPolicyValue findById(int id) {
+        try {
+            return (AllowedPolicyValue) em.createNamedQuery("AllowedPolicyValue.findById")
+                    .setParameter("id", id)
+                    .getSingleResult();
+        } catch (NoResultException ex) {
+        }
+        return null;
+    }
+
+    public List<AllowedPolicyValue> findByPolicyPropertyId(int id) {
+        try {
+            return (List<AllowedPolicyValue>) em.createNamedQuery("AllowedPolicyValue.findByPolicyPropertyId")
+                    .setParameter("policyPropertyId", id)
+                    .getResultList();
+        } catch (NoResultException ex) {
+        }
+        return null;
+    }
+
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/AllowedSettingValueFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.AllowedSettingValue;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class AllowedSettingValueFacade extends AbstractFacade<AllowedSettingValue>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public AllowedSettingValueFacade() {
+        super(AllowedSettingValue.class);
+    }
+    
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/DataFolderFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.DataFolder;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class DataFolderFacade extends AbstractFacade<DataFolder>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public DataFolderFacade() {
+        super(DataFolder.class);
+    }
+    
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/DataFolderPermissionFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.DataFolderPermission;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class DataFolderPermissionFacade extends AbstractFacade<DataFolderPermission>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public DataFolderPermissionFacade() {
+        super(DataFolderPermission.class);
+    }
+    
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/ExperimentFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.Experiment;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class ExperimentFacade extends AbstractFacade<Experiment>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public ExperimentFacade() {
+        super(Experiment.class);
+    }
+    
+    public Experiment findByName(String name) {
+        try {
+            return (Experiment) em.createNamedQuery("Experiment.findByName")
+                    .setParameter("name", name)
+                    .getSingleResult();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+
+    public boolean checkIfNameExists(String name) {
+        return findByName(name) != null;
+    }
+
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/ExperimentPolicyFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.ExperimentPolicy;
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class ExperimentPolicyFacade extends AbstractFacade<ExperimentPolicy>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public ExperimentPolicyFacade() {
+        super(ExperimentPolicy.class);
+    }
+    
+    public ExperimentPolicy findById(int id) {
+        try {
+            return (ExperimentPolicy) em.createNamedQuery("ExperimentPolicy.findById")
+                    .setParameter("id", id)
+                    .getSingleResult();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+        
+    public List<ExperimentPolicy> findByExperimentId(int id) {
+        try {
+            return (List<ExperimentPolicy>) em.createNamedQuery("ExperimentPolicy.findByExperimentId")
+                    .setParameter("experimentId", id)
+                    .getResultList();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+                
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/ExperimentPolicyPropertyValueFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.ExperimentPolicyPropertyValue;
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author bfrosik
+ */
+@Stateless
+public class ExperimentPolicyPropertyValueFacade extends AbstractFacade<ExperimentPolicyPropertyValue>
+{
+
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public ExperimentPolicyPropertyValueFacade() {
+        super(ExperimentPolicyPropertyValue.class);
+    }
+    
+    public ExperimentPolicyPropertyValue findById(int id) {
+        try {
+            return (ExperimentPolicyPropertyValue) em.createNamedQuery("ExperimentPolicyPropertyValue.findById")
+                    .setParameter("id", id)
+                    .getSingleResult();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+    
+    public List<ExperimentPolicyPropertyValue> findByExperimentPolicyId(int id) {
+        try {
+            return (List<ExperimentPolicyPropertyValue>) em.createNamedQuery("ExperimentPolicyPropertyValue.findByExperimentPolicyId")
+                    .setParameter("experimentPolicyId", id)
+                    .getResultList();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+        
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/ExperimentTypeFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.ExperimentType;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author sveseli
+ */
+@Stateless
+public class ExperimentTypeFacade extends AbstractFacade<ExperimentType>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+
+    public ExperimentTypeFacade() {
+        super(ExperimentType.class);
+    }
+
+    public ExperimentType findByName(String name) {
+        try {
+            return (ExperimentType) em.createNamedQuery("ExperimentType.findByName")
+                    .setParameter("name", name)
+                    .getSingleResult();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+    
+}

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/beans/PolicyPropertyFacade.java

+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package gov.anl.aps.dm.portal.model.beans;
+
+import gov.anl.aps.dm.portal.model.entities.PolicyProperty;
+import java.util.List;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+
+/**
+ *
+ * @author bfrosik
+ */
+@Stateless
+public class PolicyPropertyFacade extends AbstractFacade<PolicyProperty>
+{
+    @PersistenceContext(unitName = "DmWebPortalPU")
+    private EntityManager em;
+
+    @Override
+    protected EntityManager getEntityManager() {
+        return em;
+    }
+    
+    @Override
+    public void remove(PolicyProperty entity) {
+        Object o = em.merge(entity);
+        em.remove(o);
+    }
+
+
+    public PolicyPropertyFacade() {
+        super(PolicyProperty.class);
+    }
+    
+    public PolicyProperty findByName(String name) {
+        try {
+            return (PolicyProperty) em.createNamedQuery("PolicyProperty.findByName")
+                    .setParameter("name", name)
+                    .getSingleResult();
+        } catch (NoResultException ex) {
+        }
+        return null;
+    }
+
+    public PolicyProperty findById(int id) {
+        try {
+            return (PolicyProperty) em.createNamedQuery("PolicyProperty.findById")
+                    .setParameter("id", id)
+                    .getSingleResult();
+        } catch (NoResultException ex) {
+        }
+        return null;
+    }
+    
+    public List<PolicyProperty> findByPolicyTypeId(int id) {
+        try {
+            return (List<PolicyProperty>) em.createNamedQuery("PolicyProperty.findByPolicyTypeId")
+                    .setParameter("policyTypeId", id)
+                    .getResultList();
+        }
+        catch (NoResultException ex) {
+        }
+        return null;
+    }
+                   
+}