src/java/DmWebPortal/src/java/dm.portal.properties

+# 'USERNAME' string will be replaced by the actual username
+dm.portal.ldapUrl=ldaps://phoebusldap.aps.anl.gov:636
+dm.portal.ldapDnString=uid=USERNAME,ou=people,o=aps.anl.gov,dc=aps,dc=anl,dc=gov

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/constants/DmStatus.java

+
+package gov.anl.aps.dm.portal.constants;
+
+/**
+ * Status codes.
+ */
+public class DmStatus
+{
+    public static final int DM_OK = 0;
+    public static final int DM_ERROR = 1;
+    public static final int DM_DB_ERROR = 2;
+    public static final int DM_TIMEOUT = 3;
+    public static final int DM_INVALID_ARGUMENT = 4;
+    public static final int DM_INVALID_OBJECT_STATE = 5;
+    public static final int DM_OBJECT_ALREADY_EXISTS = 6;
+    public static final int DM_OBJECT_NOT_FOUND = 7;
+    public static final int DM_INVALID_DATE = 8;
+}
\ No newline at end of file

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

+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.exceptions.DmPortalException;
+import gov.anl.aps.dm.portal.model.beans.AbstractFacade;
+import gov.anl.aps.dm.portal.model.entities.CloneableEntity;
+import gov.anl.aps.dm.portal.utilities.CollectionUtility;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+
+import java.io.Serializable;
+
+import java.util.List;
+import java.util.Map;
+import javax.annotation.PostConstruct;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import javax.faces.model.SelectItem;
+import org.apache.log4j.Logger;
+import org.primefaces.component.datatable.DataTable;
+
+public abstract class CrudEntityController<EntityType extends CloneableEntity, FacadeType extends AbstractFacade<EntityType>> implements Serializable
+{
+
+    private static final Logger logger = Logger.getLogger(CrudEntityController.class.getName());
+
+
+    protected EntityType current = null;
+
+    private DataModel listDataModel = null;
+    private DataTable listDataTable = null;
+    private boolean listDataModelReset = true;
+    private List<EntityType> filteredObjectList = null;
+
+
+    private DataModel selectDataModel = null;
+    private DataTable selectDataTable = null;
+    private boolean selectDataModelReset = false;
+    private List<EntityType> selectedObjectList = null;
+
+    
+    public CrudEntityController() {
+    }
+
+    @PostConstruct
+    public void initialize() {
+    }
+
+    protected abstract FacadeType getFacade();
+
+    protected abstract EntityType createEntityInstance();
+
+    public abstract String getEntityTypeName();
+
+    public String getDisplayEntityTypeName() {
+        return getEntityTypeName();
+    }
+
+    public abstract String getCurrentEntityInstanceName();
+
+    public EntityType getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(EntityType current) {
+        this.current = current;
+    }
+
+    public void selectByRequestParams() {
+    }
+
+    public EntityType getSelected() {
+        if (current == null) {
+            current = createEntityInstance();
+        }
+        return current;
+    }
+
+
+    public String resetList() {
+        logger.debug("Resetting list");
+        resetListDataModel();
+        return prepareList();
+    }
+
+    public String prepareList() {
+        logger.debug("Preparing list");
+        current = null;
+        return "list?faces-redirect=true";
+    }
+
+
+    public DataTable getListDataTable() {
+        if (listDataTable == null) {
+            logger.debug("Recreating data table");
+            listDataTable = new DataTable();
+        }
+        return listDataTable;
+    }
+
+    public void setListDataTable(DataTable listDataTable) {
+        this.listDataTable = listDataTable;
+    }
+
+    public DataTable getSelectDataTable() {
+        return selectDataTable;
+    }
+
+    public void setSelectDataTable(DataTable selectDataTable) {
+        this.selectDataTable = selectDataTable;
+    }
+
+    public boolean isAnyListFilterSet() {
+        if (listDataTable == null) {
+            return false;
+        }
+        Map<String, Object> filterMap = listDataTable.getFilters();
+        for (Object filter : filterMap.values()) {
+            if ((String)filter != null && !((String)filter).isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+ 
+    public String prepareView(EntityType entity) {
+        logger.debug("Preparing view");
+        current = entity;
+        return "view?faces-redirect=true";
+    }
+
+    public String view() {
+        return "view?faces-redirect=true";
+    }
+
+    public String prepareCreate() {
+        current = createEntityInstance();
+        return "create?faces-redirect=true";
+    }
+    
+    public EntityType cloneEntityInstance(EntityType entity) {
+        EntityType clonedEntity;
+        try {
+            clonedEntity = (EntityType) (entity.clone());
+        }
+        catch (CloneNotSupportedException ex) {
+            logger.error("Object cannot be cloned: " + ex);
+            clonedEntity = createEntityInstance();
+        }
+        return clonedEntity;
+    }
+
+    public String prepareClone(EntityType entity) {
+        current = cloneEntityInstance(entity);
+        return "create?faces-redirect=true";
+    }
+
+    protected void prepareEntityInsert(EntityType entity) throws DmPortalException {
+    }
+
+    public String create() {
+        try {
+            EntityType newEntity = current;
+            prepareEntityInsert(current);
+            getFacade().create(current);
+            SessionUtility.addInfoMessage("Success", "Created " + getDisplayEntityTypeName() + " " + getCurrentEntityInstanceName() + ".");
+            resetListDataModel();
+            current = newEntity;
+            return view();
+        }
+        catch (DmPortalException | RuntimeException ex) {
+            SessionUtility.addErrorMessage("Error", "Could not create " + getDisplayEntityTypeName() + ": " + ex.getMessage());
+            return null;
+        }
+    }
+
+    public String prepareEdit(EntityType entity) {
+        current = entity;
+        return edit();
+    }
+
+    public String edit() {
+        resetSelectDataModel();
+        return "edit?faces-redirect=true";
+    }
+
+    protected void prepareEntityUpdate(EntityType entity) throws DmPortalException {
+    }
+
+    public String update() {
+        try {
+            logger.debug("Updating " + getDisplayEntityTypeName() + " " + getCurrentEntityInstanceName());
+            prepareEntityUpdate(current);
+            EntityType updatedEntity = getFacade().edit(current);
+            SessionUtility.addInfoMessage("Success", "Updated " + getDisplayEntityTypeName() + " " + getCurrentEntityInstanceName() + ".");
+            resetListDataModel();
+            current = updatedEntity;
+            return view();
+        }
+        catch (DmPortalException | RuntimeException ex) {
+            SessionUtility.addErrorMessage("Error", "Could not update " + getDisplayEntityTypeName() + ": " + ex.getMessage());
+            return null;
+        }
+    }
+
+    public void destroy(EntityType entity) {
+        current = entity;
+        destroy();
+    }
+
+    public String destroy() {
+        if (current == null) {
+            logger.warn("Current item is not set");
+            // Do nothing if current item is not set.
+            return null;
+        }
+        try {
+            logger.debug("Destroying " + getCurrentEntityInstanceName());
+            getFacade().remove(current);
+            SessionUtility.addInfoMessage("Success", "Deleted " + getDisplayEntityTypeName() + " " + getCurrentEntityInstanceName() + ".");
+            resetListDataModel();
+            return prepareList();
+        }
+        catch (Exception ex) {
+            SessionUtility.addErrorMessage("Error", "Could not delete " + getDisplayEntityTypeName() + ": " + ex.getMessage());
+            return null;
+        }
+    }
+
+    public DataModel createListDataModel() {
+        return new ListDataModel(getFacade().findAll());
+    }
+
+    public DataModel getListDataModel() {
+        if (listDataModel == null) {
+            listDataModel = createListDataModel();
+        }
+        return listDataModel;
+    }
+
+    public void prepareEntityListForSelection(List<EntityType> selectEntityList) {
+    }
+
+    public DataModel createSelectDataModel() {
+        List<EntityType> selectEntityList = getFacade().findAll();
+        prepareEntityListForSelection(selectEntityList);
+        return new ListDataModel(selectEntityList);
+    }
+
+    public DataModel getSelectDataModel() {
+        if (selectDataModel == null) {
+            selectDataModel = createSelectDataModel();
+        }
+        return selectDataModel;
+    }
+
+    public DataModel getItems() {
+        return getListDataModel();
+    }
+
+    public List<EntityType> getSelectedObjectListAndResetSelectDataModel() {
+        List<EntityType> returnList = selectedObjectList;
+        resetSelectDataModel();
+        return returnList;
+    }
+
+    public List<EntityType> getSelectedObjectList() {
+        return selectedObjectList;
+    }
+
+    public List<EntityType> getFilteredObjectList() {
+        boolean isNull = (filteredObjectList == null);
+        logger.debug("filteredObjectList is null "+ isNull);
+        return filteredObjectList;
+    }
+
+    public List<EntityType> getFilteredItems() {
+        return filteredObjectList;
+    }
+
+    public void resetSelectedObjectList() {
+        selectedObjectList = null;
+    }
+
+    public void setSelectedObjectList(List<EntityType> selectedObjectList) {
+        this.selectedObjectList = selectedObjectList;
+    }
+
+    public void setFilteredObjectList(List<EntityType> filteredObjectList) {
+        this.filteredObjectList = filteredObjectList;
+    }
+
+    public void setFilteredItems(List<EntityType> filteredItems) {
+        this.filteredObjectList = filteredItems;
+    }
+
+    public void resetListDataModel() {
+        listDataModel = null;
+        listDataTable = null;
+        listDataModelReset = true;
+        filteredObjectList = null;
+        current = null;
+    }
+
+    public void resetSelectDataModel() {
+        selectDataModel = null;
+        selectDataTable = null;
+        selectedObjectList = null;
+        selectDataModelReset = true;
+    }
+
+    public List<EntityType> getAvailableItems() {
+        return getFacade().findAll();
+    }
+
+    public EntityType getEntity(Integer id) {
+        return getFacade().find(id);
+    }
+
+    public SelectItem[] getAvailableItemsForSelectMany() {
+        return CollectionUtility.getSelectItems(getFacade().findAll(), false);
+    }
+
+    public SelectItem[] getAvailableItemsForSelectOne() {
+        return CollectionUtility.getSelectItems(getFacade().findAll(), true);
+    }
+
+    public String getCurrentViewId() {
+        return SessionUtility.getCurrentViewId();
+    }
+
+    public static String displayEntityList(List<?> entityList) {
+        String itemDelimiter = ", ";
+        return CollectionUtility.displayItemListWithoutOutsideDelimiters(entityList, itemDelimiter);
+    }
+
+
+    public boolean isListDataModelReset() {
+        if (listDataModelReset) {
+            listDataModelReset = false;
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isSelectDataModelReset() {
+        if (selectDataModelReset) {
+            selectDataModelReset = false;
+            return true;
+        }
+        return false;
+    }
+
+}

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

+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.model.entities.CloneableEntity;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.PostConstruct;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+import org.apache.log4j.Logger;
+import org.primefaces.component.datatable.DataTable;
+
+public abstract class DataTableController<EntityType extends CloneableEntity> implements Serializable
+{
+
+    private static final Logger logger = Logger.getLogger(DataTableController.class.getName());
+
+
+    protected EntityType current = null;
+
+    private DataModel listDataModel = null;
+    private DataTable listDataTable = null;
+    private boolean listDataModelReset = true;
+    private List<EntityType> filteredObjectList = null;
+    private List<EntityType> selectedObjectList = null;
+
+    
+    public DataTableController() {
+    }
+
+    @PostConstruct
+    public void initialize() {
+    }
+    
+    public abstract String getEntityTypeName();
+
+//    public abstract String getCurrentEntityInstanceName();
+
+    public EntityType getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(EntityType current) {
+        this.current = current;
+    }
+
+    public DataModel createListDataModel() {
+        return new ListDataModel(findAll());
+    }
+
+    public DataModel getListDataModel() {
+        if (listDataModel == null) {
+            listDataModel = createListDataModel();
+        }
+        return listDataModel;
+    }
+
+    public abstract List<EntityType> findAll();
+
+    public void resetList() {
+        logger.debug("Resetting list");
+        listDataModel = null;
+        listDataTable = null;
+        listDataModelReset = true;
+        filteredObjectList = null;
+        current = null;
+    }
+
+   public DataTable getListDataTable() {
+        if (listDataTable == null) {
+            logger.debug("Recreating data table");
+            listDataTable = new DataTable();
+        }
+        return listDataTable;
+    }
+
+    public void setListDataTable(DataTable listDataTable) {
+        this.listDataTable = listDataTable;
+    }
+
+    public boolean isAnyListFilterSet() {
+        if (listDataTable == null) {
+            return false;
+        }
+        Map<String, Object> filterMap = listDataTable.getFilters();
+        for (Object filter : filterMap.values()) {
+            if ((String)filter != null && !((String)filter).isEmpty()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public List<EntityType> getFilteredObjectList() {
+        return filteredObjectList;
+    }
+
+     public void setFilteredObjectList(List<EntityType> filteredObjectList) {
+        this.filteredObjectList = filteredObjectList;
+    }
+
+   public List<EntityType> getFilteredItems() {
+        return filteredObjectList;
+    }
+
+    public void setFilteredItems(List<EntityType> filteredItems) {
+        this.filteredObjectList = filteredItems;
+    }
+    
+    public boolean isListDataModelReset() {
+        if (listDataModelReset) {
+            listDataModelReset = false;
+            return true;
+        }
+        return false;
+    }
+
+    public List<EntityType> getSelectedObjectList() {
+        return selectedObjectList;
+    }
+    
+    public void setSelectedObjectList(List<EntityType> selectedObjectList) {
+        this.selectedObjectList = selectedObjectList;
+    }
+    
+}

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

+package gov.anl.aps.dm.portal.controllers;
+
+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.model.entities.Experiment;
+import gov.anl.aps.dm.portal.model.beans.ExperimentFacade;
+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("experimentController")
+@SessionScoped
+public class ExperimentController extends CrudEntityController<Experiment, ExperimentFacade>
+{
+
+    private static final Logger logger = Logger.getLogger(ExperimentController.class.getName());
+
+    @EJB
+    private ExperimentFacade experimentFacade;
+
+    public ExperimentController() {
+    }
+
+    @Override
+    protected ExperimentFacade getFacade() {
+        return experimentFacade;
+    }
+
+    @Override
+    protected Experiment createEntityInstance() {
+        return new Experiment();
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "experiment";
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getName();
+        }
+        return "";
+    }
+
+    @Override
+    public List<Experiment> getAvailableItems() {
+        return super.getAvailableItems();
+    }
+
+    @Override
+    public String prepareEdit(Experiment experiment) {
+        return super.prepareEdit(experiment);
+    }
+
+    @Override
+    public void prepareEntityInsert(Experiment experiment) throws ObjectAlreadyExists, InvalidDate {
+        Experiment existingExperiment = experimentFacade.findByName(experiment.getName());
+        if (existingExperiment != null) {
+            throw new ObjectAlreadyExists("Experiment " + experiment.getName() + " already exists.");
+        }
+        
+        if ((experiment.getStartDate() != null) && (experiment.getEndDate() != null) && (experiment.getEndDate().before(experiment.getStartDate()))) {
+            throw new InvalidDate("Experiment end date is before start date.");
+        }
+        
+        logger.debug("Inserting new experiment " + experiment.getName());                
+    }
+
+    @Override
+    public void prepareEntityUpdate(Experiment experiment) throws DmPortalException {
+        super.prepareEntityUpdate(experiment);
+        if ((experiment.getStartDate() != null) && (experiment.getEndDate() != null) && (experiment.getEndDate().before(experiment.getStartDate()))) {
+            throw new InvalidDate("Experiment end date is before start date.");
+        }        
+    }
+   
+
+    @FacesConverter(forClass = Experiment.class)
+    public static class ExperimentControllerConverter implements Converter
+    {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            ExperimentController controller = (ExperimentController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "experimentController");
+            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 Experiment) {
+                Experiment o = (Experiment) object;
+                return getStringKey(o.getId());
+            }
+            else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + Experiment.class.getName());
+            }
+        }
+
+    }
+
+}
\ No newline at end of file

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

+package gov.anl.aps.dm.portal.controllers;
+
+import gov.anl.aps.dm.portal.exceptions.DmPortalException;
+import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
+import gov.anl.aps.dm.portal.model.entities.ExperimentType;
+import gov.anl.aps.dm.portal.model.beans.ExperimentTypeFacade;
+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("experimentTypeController")
+@SessionScoped
+public class ExperimentTypeController extends CrudEntityController<ExperimentType, ExperimentTypeFacade>
+{
+
+    private static final Logger logger = Logger.getLogger(ExperimentTypeController.class.getName());
+
+    @EJB
+    private ExperimentTypeFacade experimentTypeFacade;
+
+    public ExperimentTypeController() {
+    }
+
+    @Override
+    protected ExperimentTypeFacade getFacade() {
+        return experimentTypeFacade;
+    }
+
+    @Override
+    protected ExperimentType createEntityInstance() {
+        return new ExperimentType();
+    }
+
+    @Override
+    public String getEntityTypeName() {
+        return "experimentType";
+    }
+
+    @Override
+    public String getCurrentEntityInstanceName() {
+        if (getCurrent() != null) {
+            return getCurrent().getName();
+        }
+        return "";
+    }
+
+    @Override
+    public List<ExperimentType> getAvailableItems() {
+        return super.getAvailableItems();
+    }
+
+    @Override
+    public String prepareEdit(ExperimentType experimentType) {
+        return super.prepareEdit(experimentType);
+    }
+
+    @Override
+    public void prepareEntityInsert(ExperimentType experimentType) throws ObjectAlreadyExists {
+        ExperimentType existingExperimentType = experimentTypeFacade.findByName(experimentType.getName());
+        if (existingExperimentType != null) {
+            throw new ObjectAlreadyExists("Experiment type " + experimentType.getName() + " already exists.");
+        }
+        logger.debug("Inserting new experiment type " + experimentType.getName());
+    }
+
+    @Override
+    public void prepareEntityUpdate(ExperimentType experimentType) throws DmPortalException {
+        super.prepareEntityUpdate(experimentType);
+    }
+   
+
+    @FacesConverter(forClass = ExperimentType.class)
+    public static class ExperimentTypeControllerConverter implements Converter
+    {
+
+        @Override
+        public Object getAsObject(FacesContext facesContext, UIComponent component, String value) {
+            if (value == null || value.length() == 0) {
+                return null;
+            }
+            ExperimentTypeController controller = (ExperimentTypeController) facesContext.getApplication().getELResolver().
+                    getValue(facesContext.getELContext(), null, "experimentTypeController");
+            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 ExperimentType) {
+                ExperimentType o = (ExperimentType) object;
+                return getStringKey(o.getId());
+            }
+            else {
+                throw new IllegalArgumentException("object " + object + " is of type " + object.getClass().getName() + "; expected type: " + ExperimentType.class.getName());
+            }
+        }
+
+    }
+
+}
\ No newline at end of file

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.model.beans.UserInfoFacade;
+import gov.anl.aps.dm.portal.model.entities.UserInfo;
+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;
+
+    private String username = null;
+    private String password = null;
+    private boolean loggedIn = false;
+    private UserInfo user = null;
+
+    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("Incomplete Input", "Please enter both username and password.");
+            return (username = password = null);
+        }
+
+        user = userInfoFacade.findByUsername(username);
+        if (user == null) {
+            SessionUtility.addErrorMessage("Unknown User", "Username " + username + " is not registered. Contact administrator.");
+            return (username = password = null);
+        }
+
+        boolean validCredentials = false;
+        if (user.getPassword() != null && user.getPassword().equals(password)) {
+            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.");
+            return getLandingPage();
+        }
+        else {
+            SessionUtility.addErrorMessage("Invalid Credentials", "Username/password combination could not be verified.");
+            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 String displayRole() {
+        return "User";
+    }
+
+    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";
+    }
+
+}

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.ObjectAlreadyExists;
+import gov.anl.aps.dm.portal.model.beans.RoleTypeFacade;
+import gov.anl.aps.dm.portal.model.entities.RoleType;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+import java.util.ArrayList;
+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 List<String> systemRoles = new ArrayList();
+    {
+        systemRoles.add("Administrator");
+    }
+
+    private static final Logger logger = Logger.getLogger(RoleTypeController.class.getName());
+
+    @EJB
+    private RoleTypeFacade roleTypeFacade;
+
+    public RoleTypeController() {
+    }
+
+    @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 {
+        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 {
+        super.prepareEntityUpdate(roleType);
+    }
+
+    public boolean isRoleSystemType(String name) {
+        if (name == null) {
+            logger.warn("Current row is not set");
+            // Do nothing if current item is not set.
+            return false;
+        }
+
+        return systemRoles.contains(name);
+    }
+
+    @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.exceptions.DmPortalException;
+import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
+import gov.anl.aps.dm.portal.model.entities.UserInfo;
+import gov.anl.aps.dm.portal.model.beans.UserInfoFacade;
+import gov.anl.aps.dm.portal.utilities.SessionUtility;
+import java.util.ArrayList;
+
+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("userInfoController")
+@SessionScoped
+public class UserInfoController extends CrudEntityController<UserInfo, UserInfoFacade>
+{
+
+    private static final Logger logger = Logger.getLogger(UserInfoController.class.getName());
+
+    @EJB
+    private UserInfoFacade userInfoFacade;
+
+    private String passwordEntry = null;
+    
+    public UserInfoController() {
+    }
+
+    @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 {
+        UserInfo existingUser = userInfoFacade.findByUsername(user.getUsername());
+        if (existingUser != null) {
+            throw new ObjectAlreadyExists("User " + user.getUsername() + " already exists.");
+        }
+        logger.debug("Inserting new user " + user.getUsername());
+    }
+
+    @Override
+    public void prepareEntityUpdate(UserInfo user) throws DmPortalException {
+        if (passwordEntry != null && !passwordEntry.isEmpty()) {
+            user.setPassword(passwordEntry);
+        }
+        passwordEntry = null;
+        super.prepareEntityUpdate(user);
+    }
+
+    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;
+    }
+
+@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());
+            }
+        }
+
+    }
+
+}
\ No newline at end of file

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;
+
+    public UserSystemRoleController() {
+        this.systemRoleTable = new SystemRoleTypeTable();
+        this.noSystemRoleTable = new NoSystemRoleTypeTable();
+    }
+
+    class SystemRoleTypeTable extends DataTableController<UserInfo> {
+
+        @Override
+        public String getEntityTypeName() {
+            return "UserInfo";
+        }
+
+        @Override
+        public List<UserInfo> findAll() {
+            try {
+                int id = Integer.parseInt(systemRoleId);
+                return userInfoFacade.findSystemRoleUsers(id);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+    }
+    
+    class NoSystemRoleTypeTable extends DataTableController<UserInfo> {
+
+        @Override
+        public String getEntityTypeName() {
+            return "UserInfo";
+        }
+
+        @Override
+        public List<UserInfo> findAll() {
+            try {
+                int id = Integer.parseInt(systemRoleId);
+                return userInfoFacade.findNoSystemRoleUsers(id);
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+    }
+    
+    private SystemRoleTypeTable systemRoleTable;
+    private NoSystemRoleTypeTable noSystemRoleTable;
+
+    private String systemRoleId;
+
+    private static final Logger logger = Logger.getLogger(UserSystemRoleController.class.getName());
+
+
+    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 getSystemRoleId() {
+        return systemRoleId;
+    }
+
+    public void setSystemRoleId(String systemRoleId) {
+        this.systemRoleId = systemRoleId;
+    }
+         
+    public String getSystemRoleName() {
+        int id = Integer.parseInt(systemRoleId);
+        return roleTypeFacade.findById(id).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();
+//        return "/views/userSystemRole/list?faces-redirect=true";
+    }
+    
+   public boolean hasSystemRole(String user) {
+        logger.debug("in hasSystemRole username, roleId "+ user+" "+systemRoleId);
+        int id = Integer.parseInt(systemRoleId);
+        RoleType rt = roleTypeFacade.findById(id);
+        if (rt == null) {
+            return false;
+        }
+        return rt.isAdmin(user);
+    }
+
+    public String prepareSystemRoleView() {
+        logger.debug("Preparing system role view");
+        return "/views/userSystemRole/list?faces-redirect=true";
+    }
+
+    public String addSystemRole() {
+        int id = Integer.parseInt(systemRoleId);
+        RoleType rt = roleTypeFacade.findById(id);
+        if (rt != null) {
+            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) {
+                    rt.addRoleTypeToUser(userInfo);
+                }
+            }
+        }
+        try {
+            roleTypeFacade.edit(rt);
+            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");
+        int id = Integer.parseInt(systemRoleId);
+        RoleType rt = roleTypeFacade.findById(id);
+        if (rt != null) {
+            rt.removeRoleTypeFromUser(systemRoleTable.current);
+        }
+        try {
+        roleTypeFacade.edit(rt);
+        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/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 javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+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);
+    }
+    
+}

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 javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+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);
+    }
+    
+}