started to implement permission handling into views and pages

account-ui/src/main/java/de/muehlencord/shared/account/web/EnsurePermissionsBean.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2018 Joern Muehlencord <joern at muehlencord.de>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.muehlencord.shared.account.web;
+
+import de.muehlencord.shared.account.business.account.boundary.AccountPermissions;
+import de.muehlencord.shared.account.business.account.entity.AccountException;
+import de.muehlencord.shared.account.business.application.boundary.ApplicationPermissions;
+import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
+import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
+import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+import java.util.Arrays;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Initialized;
+import javax.enterprise.event.Observes;
+import javax.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ * @author Joern Muehlencord <joern at muehlencord.de>
+ */
+@ApplicationScoped
+public class EnsurePermissionsBean {
+
+    @Inject
+    ApplicationEntity application;
+
+    @Inject
+    ApplicationPermissionControl applicationPermissionControl;
+
+    @Inject
+    ApplicationRoleControl applicationRoleControl;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EnsurePermissionsBean.class);
+
+    public void init(@Observes @Initialized(ApplicationScoped.class) Object init) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Ensure all permissions for {} are available", application.getApplicationName());
+        }
+        applicationPermissionControl.setupPermissions(Arrays.asList(ApplicationPermissions.values()));
+        applicationPermissionControl.setupPermissions(Arrays.asList(AccountPermissions.values()));
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("All permissions added to application", application.getApplicationName());
+        }
+
+        // all permissions available - ensure permission is assigned to Admin role
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Ensuring Admin role for {} has all permissions", application.getApplicationName());
+        }
+        try {
+            applicationRoleControl.setupRolePermission(Arrays.asList(ApplicationPermissions.values()), "Admin"); // NOI18N
+            applicationRoleControl.setupRolePermission(Arrays.asList(AccountPermissions.values()), "Admin"); // NOI18N
+        } catch (AccountException ex) {
+            LOGGER.error("Error adding permission to Admin role");
+            if (LOGGER.isDebugEnabled()) {
+                LOGGER.debug(ex.toString(), ex);
+            } else {
+                LOGGER.error(ex.toString());
+            }
+        }
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("All permissions added to Admin role of {}", application.getApplicationName());
+        }
+
+    }
+
+}

account-ui/src/main/java/de/muehlencord/shared/account/web/FacesContextProducer.java

@@ -15,6 +15,7 @@
  */
 package de.muehlencord.shared.account.web;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
@@ -24,6 +25,7 @@ import javax.faces.context.FacesContext;
  *
  * @author Joern Muehlencord <joern at muehlencord.de>
  */
+@ApplicationScoped
 public class FacesContextProducer {
     
     @Produces

account-ui/src/main/java/de/muehlencord/shared/account/web/PermissionConstants.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 Joern Muehlencord <joern at muehlencord.de>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.muehlencord.shared.account.web;
+
+import de.muehlencord.shared.account.business.application.boundary.ApplicationPermissions;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Named;
+
+/**
+ * TODO replace with omnifaces:importConstants currently problems with Netbeans
+ * to import omnifaces taglib
+ *
+ * @author Joern Muehlencord <joern at muehlencord.de>
+ */
+@Named(value = "permissionConstants")
+@ApplicationScoped
+public class PermissionConstants {
+
+    public String getApplicationListAll() {
+        return ApplicationPermissions.APP_LISTALL.getName();
+    }
+
+    public String getPermissionsCombined() {
+        return ApplicationPermissions.PERMISSION_ADD.getName() + ","
+                + ApplicationPermissions.PERMISSION_EDIT.getName() + ","
+                + ApplicationPermissions.PERMISSION_DELETE.getName();
+    }
+    
+    public String getRolesCombined() {
+        return ApplicationPermissions.ROLE_ADD.getName() + ","
+                + ApplicationPermissions.ROLE_EDIT.getName() + ","
+                + ApplicationPermissions.ROLE_DELETE.getName();
+    }    
+
+}

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/AccountView.java

@@ -6,7 +6,7 @@ import de.muehlencord.shared.account.business.account.entity.AccountEntity;
 import de.muehlencord.shared.account.business.account.entity.AccountException;
 import de.muehlencord.shared.account.business.account.entity.AccountLoginEntity;
 import de.muehlencord.shared.account.business.account.entity.AccountStatus;
-import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.Serializable;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/ApplicationView.java

@@ -2,9 +2,12 @@ package de.muehlencord.shared.account.web.presentation;
 
 import de.muehlencord.shared.account.business.application.boundary.ApplicationService;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
+import de.muehlencord.shared.account.util.AccountSecurityException;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Named;
@@ -27,6 +30,9 @@ public class ApplicationView implements Serializable {
     @Inject
     ApplicationService applicationService;
 
+    @Inject
+    Locale locale;
+
     private ApplicationEntity currentApplication = null;
     private ApplicationEntity editApplication = null;
     private List<ApplicationEntity> applicationList = null;
@@ -53,7 +59,18 @@ public class ApplicationView implements Serializable {
 
     public List<ApplicationEntity> getAllApplications() {
         if (applicationList == null) {
+            try {
                 applicationList = applicationService.getAllApplications();
+                return applicationList;
+            } catch (AccountSecurityException ex) {
+                if (LOGGER.isDebugEnabled()) {
+                    LOGGER.debug(ex.toString(), ex);
+                } else {
+                    LOGGER.error(ex.toString());
+                }
+                FacesUtil.addGlobalErrorMessage("Error " + ex.getErrorCode(), ex.getLocalizedMessage(locale));
+                return new ArrayList<>();
+            }
         }
         return applicationList;
     }

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/PermissionView.java

@@ -16,7 +16,7 @@
 package de.muehlencord.shared.account.web.presentation;
 
 import de.muehlencord.shared.account.business.account.entity.AccountException;
-import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationPermissionEntity;
 import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.jeeutil.FacesUtil;
@@ -61,7 +61,7 @@ public class PermissionView implements Serializable {
                 FacesUtil.addErrorMessage("editDialogMessages", "Error", "Permission name must not be null");
             } else {
                 if (currentPermission.getId() == null) {
-                    applicationPermissionService.create(applicationView.getCurrentApplication(), newPermissionName, newPermissionName);
+                    applicationPermissionService.create(applicationView.getCurrentApplication(), newPermissionName, newPermissionDescription);
                     FacesUtil.addGlobalInfoMessage("Info", "Permission " + newPermissionName + " created");
                 } else {
                     applicationPermissionService.update(currentPermission);

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/RoleView.java

@@ -17,8 +17,8 @@ package de.muehlencord.shared.account.web.presentation;
 
 import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.account.entity.AccountException;
-import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationPermissionEntity;
-import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.jeeutil.FacesUtil;
 import java.io.Serializable;

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationRoleNameValidator.java

@@ -1,13 +1,14 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity;
 import de.muehlencord.shared.account.business.application.control.ApplicationRoleControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.account.util.AccountPU;
 import java.io.Serializable;
-import javax.ejb.EJB;
+import java.util.UUID;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
@@ -33,6 +34,13 @@ public class UniqueApplicationRoleNameValidator implements Validator, Serializab
 
     @Override
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+
+        Object oldRoleNameObj = ((UIInput) component).getValue();
+        String oldRoleName = "";
+        if (oldRoleNameObj != null) {
+            oldRoleName = oldRoleNameObj.toString();
+        }
+
         Object applicationObj = component.getAttributes().get("application");
         if ((applicationObj != null) && (applicationObj instanceof ApplicationEntity)) {
             ApplicationEntity application = (ApplicationEntity) applicationObj;
@@ -43,8 +51,11 @@ public class UniqueApplicationRoleNameValidator implements Validator, Serializab
                 String roleName = (String) value;
                 ApplicationRoleEntity existingRole = applicationRoleControl.findByName(application, roleName);
                 if (existingRole != null) {
+                    if (!oldRoleName.equals(roleName)) {
+                        // name of role changed and there is another role with the new name already  --> this must not happen
                         throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Role name invalid", "Role already exists"));
                     }
+                }
             } else {
                 throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Role name invalid", "Role name must be a string value"));
                 // TODO add IPRS logger - someone is trying to cheat 

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniqueApplicationValidator.java

@@ -3,8 +3,10 @@ package de.muehlencord.shared.account.web.presentation;
 import de.muehlencord.shared.account.business.application.boundary.ApplicationService;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import java.io.Serializable;
+import java.util.UUID;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
@@ -28,6 +30,13 @@ public class UniqueApplicationValidator implements Validator, Serializable {
 
     @Override
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+
+        Object oldAppNameObj = ((UIInput) component).getValue();
+        String oldAppName = "";
+        if (oldAppNameObj != null) {
+            oldAppName = oldAppNameObj.toString();
+        }
+
         if (value == null) {
             throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Application name invalid", "Application name must not be empty"));
         }
@@ -35,8 +44,12 @@ public class UniqueApplicationValidator implements Validator, Serializable {
             String applicationname = (String) value;
             ApplicationEntity existingApplication = applicationService.findByApplicationName(applicationname);
             if (existingApplication != null) {
+                if (!oldAppName.equals(applicationname)) {
+                    // name of application changed and there is another application with the new 
+                    // name already  --> this must not happen
                     throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Application name invalid", "Application already exists"));
                 }
+            }
             LOGGER.info("Name = {}", applicationname);
         } else {
             throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Application name invalid", "Application name must be a string value"));

account-ui/src/main/java/de/muehlencord/shared/account/web/presentation/UniquePermissionNameValidator.java

@@ -1,20 +1,19 @@
 package de.muehlencord.shared.account.web.presentation;
 
-import de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity;
+import de.muehlencord.shared.account.business.application.entity.ApplicationPermissionEntity;
 import de.muehlencord.shared.account.business.application.control.ApplicationPermissionControl;
 import de.muehlencord.shared.account.business.application.entity.ApplicationEntity;
 import de.muehlencord.shared.account.util.AccountPU;
 import java.io.Serializable;
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -24,7 +23,6 @@ import org.slf4j.LoggerFactory;
 public class UniquePermissionNameValidator implements Validator, Serializable {
 
     private static final long serialVersionUID = 2526409681909574670L;
-    private static final Logger LOGGER = LoggerFactory.getLogger(UniquePermissionNameValidator.class);
 
     @Inject
     @AccountPU
@@ -35,6 +33,13 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
 
     @Override
     public void validate(FacesContext context, UIComponent component, Object value) throws ValidatorException {
+
+        Object oldPermissionNameObj = ((UIInput) component).getValue();
+        String oldPermissionName = "";
+        if (oldPermissionNameObj != null) {
+            oldPermissionName = oldPermissionNameObj.toString();
+        }
+
         Object applicationObj = component.getAttributes().get("application");
         if ((applicationObj != null) && (applicationObj instanceof ApplicationEntity)) {
             ApplicationEntity application = (ApplicationEntity) applicationObj;
@@ -45,8 +50,12 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
                 String permissionName = (String) value;
                 ApplicationPermissionEntity existingPermission = applicationPermissionControl.findPermissionByName(application, permissionName);
                 if (existingPermission != null) {
+                    if ((!oldPermissionName.equals (permissionName))) {
+                        // name of permission changed and there is another permission with the new 
+                        // name already  --> this must not happen
                         throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission already exists"));
                     }
+                }
             } else {
                 throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Permission name invalid", "Permission name must be a string value"));
                 // TODO add IPRS logger - someone is trying to cheat 
@@ -54,7 +63,6 @@ public class UniquePermissionNameValidator implements Validator, Serializable {
         } else {
             throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Application not set", "Permission name cannot be set if application is unknown"));
         }
-
     }
 
 }

account-ui/src/main/resources/META-INF/persistence.xml

@@ -5,9 +5,10 @@
     <class>de.muehlencord.shared.account.business.account.entity.AccountEntity</class>
     <class>de.muehlencord.shared.account.business.account.entity.AccountHistoryEntity</class>
     <class>de.muehlencord.shared.account.business.account.entity.AccountLoginEntity</class>
-    <class>de.muehlencord.shared.account.business.account.entity.ApplicationPermissionEntity</class>
+    <class>de.muehlencord.shared.account.business.account.entity.ApiKeyEntity</class>
-    <class>de.muehlencord.shared.account.business.account.entity.ApplicationRoleEntity</class>
     <class>de.muehlencord.shared.account.business.application.entity.ApplicationEntity</class>
+    <class>de.muehlencord.shared.account.business.application.entity.ApplicationPermissionEntity</class>
+    <class>de.muehlencord.shared.account.business.application.entity.ApplicationRoleEntity</class>
     <class>de.muehlencord.shared.account.business.config.entity.ConfigEntity</class>
     <class>de.muehlencord.shared.account.business.mail.entity.MailTemplateEntity</class>
     <exclude-unlisted-classes>true</exclude-unlisted-classes>
@@ -15,7 +16,7 @@
     <validation-mode>NONE</validation-mode>
     <properties>
       <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL94Dialect"/>
-      <property name="hibernate.show_sql" value="true"/>
+      <property name="hibernate.show_sql" value="false"/>
       <property name="hibernate.cache.use_second_level_cache" value="true"/>
       <property name="hibernate.cache.use_query_cache" value="true"/>
     </properties>

account-ui/src/main/resources/admin-config.properties

@@ -1,5 +1,5 @@
 admin.loginPage=/login.xhtml 
-admin.indexPage=/web/account.xhtml 
+admin.indexPage=/web/index.xhtml 
 #admin.dateFormat= 
 #admin.breadcrumbSize=5
 admin.renderMessages=true

account-ui/src/main/webapp/WEB-INF/shiro.ini

@@ -29,10 +29,10 @@ ${shiro.ldapRealm}
 
 # JDBC Realm setup
 jdbcRealm = org.apache.shiro.realm.jdbc.JdbcRealm
-jdbcRealm.permissionsLookupEnabled=false
+jdbcRealm.permissionsLookupEnabled=true
-# jdbcRealm.authenticationQuery = select al.account_password from account a, account_login al where al.account = a.id and a.username = ? and status not in ('LOCKED','DELETED')
 jdbcRealm.authenticationQuery = SELECT accl.account_password from account acc, account_login accl, account_role accr, application_role appr WHERE accl.account = acc.id AND acc.id = accr.account AND accr.account_role = appr.id AND appr.application = '143a2bd3-7e0b-4162-a76e-3031331c7dfe' AND acc.status not in ('LOCKED','DELETED') AND acc.username = ?
 jdbcRealm.userRolesQuery = select r.role_name from application_role r, account_role ar, account a WHERE a.username = ? AND a.id = ar.account AND ar.account_role = r.id
+jdbcRealm.permissionsQuery = select permission_name from application_role appr, role_permission rp, application_permission appp WHERE appr.role_name = ? AND appr.application = '${applicationUuid}' AND rp.application_role = appr.id AND rp.role_permission = appp.id
 jdbcRealm.credentialsMatcher = $passwordMatcher
 jdbcRealm.dataSource = $datasource
 
@@ -44,7 +44,7 @@ securityManager.authenticator.authenticationStrategy = $authcStrategy
 # Setup authentication filter
 authc = de.muehlencord.shirofaces.filter.FacesAjaxAwarePassThruAuthenticationFilter
 authc.loginUrl = /login.xhtml
-authc.successUrl  = /web/account.xhtml
+authc.successUrl  = /web/index.xhtml
 
 roles.unauthorizedUrl = /error/accessDenied.xhtml
 

account-ui/src/main/webapp/WEB-INF/web.xml

@@ -36,7 +36,7 @@
         </session-timeout>
     </session-config>
     <welcome-file-list>
-        <welcome-file>web/account.xhtml</welcome-file>
+        <welcome-file>web/index.xhtml</welcome-file>
     </welcome-file-list>
     <!-- Shiro Web Environment -->
     <listener>

account-ui/src/main/webapp/login.xhtml

@@ -56,7 +56,7 @@
 
         <div class="login-box">
             <div class="login-logo">
-                <p:link href="/web/account.xhtml"><b>Account&nbsp;</b>Management</p:link>  
+                <p:link href="/web/accounts.xhtml"><b>Account&nbsp;</b>Management</p:link>  
                 <h:outputLabel rendered="#{instanceView.developmentVersion}" value="#{instanceView.instanceName}" />
             </div>
             <!-- /.login-logo -->

account-ui/src/main/webapp/resources/template/leftmenu.xhtml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
                 xmlns:p="http://primefaces.org/ui"              
                 xmlns:shiro="http://shiro.apache.org/tags">
@@ -8,26 +7,42 @@
 
     <shiro:authenticated>
         <ul class="sidebar-menu tree" data-widget="tree">
+
             <li>                
                 <p:link outcome="/web/index.xhtml">
-                    <i class="fa fa-tablet"></i>
+                    <i class="fa fa-home"></i>
-                    <span>Application</span>
+                    <span>Home</span>
                 </p:link>
             </li>                  
+
+            <shiro:hasPermission name="#{permissionConstants.applicationListAll}">
+                <li>
+                    <p:link outcome="/web/applications.xhtml">
+                        <i class="fa fa-tablet"></i>
+                        <span>Applications</span>
+                    </p:link>
+                </li>                              
+            </shiro:hasPermission>
+
+            <shiro:hasAnyPermission name="#{permissionConstants.permissionsCombined}">
                 <li>
                     <p:link outcome="/web/permissions.xhtml">
                         <i class="fa fa-list-ul"></i>
                         <span>Permissions</span>
                     </p:link>
                 </li>                 
+            </shiro:hasAnyPermission>
+
+            <shiro:hasAnyPermission name="#{permissionConstants.rolesCombined}">
                 <li>
                     <p:link outcome="/web/roles.xhtml">
                         <i class="fa fa-circle"></i>
                         <span>Roles</span>
                     </p:link>
                 </li>            
+            </shiro:hasAnyPermission>
             <li>
-                <p:link outcome="/web/account.xhtml">
+                <p:link outcome="/web/accounts.xhtml">
                     <i class="fa fa-user"></i>
                     <span>Accounts</span>
                 </p:link>

account-ui/src/main/webapp/web/accounts.xhtml

@@ -19,6 +19,7 @@
     </ui:define>
 
     <ui:define name="body">
+        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
             <h:form id="accountForm" prependId="false">           
                 <p:dataTable id="accountTable" value="#{accountView.accounts}" var="account" rowKey="#{account.username}" selectionMode="single" selection="#{accountView.currentAccount}"
                              styleClass="box-primary">
@@ -117,6 +118,7 @@
 
                 <composite:confirmationDialog />
             </h:form>
+        </p:panel>
 
 
         <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"

account-ui/src/main/webapp/web/applications.xhtml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                template="/resources/template/template.xhtml"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
+                xmlns:co="http://java.sun.com/jsf/composite/composite"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                xmlns:composite="http://xmlns.jcp.org/jsf/composite/composite">
+
+    <ui:define name="title">
+        Applications
+    </ui:define>
+
+    <ui:define name="body" >
+
+        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
+            <h:form id="applicationForm" prependId="false">           
+
+                <div class="ui-g ui-fluid">
+                    <div class="col-sm-12 col-md-6">
+                        <p:selectOneMenu id="applicationSelect" value="#{applicationView.currentApplication}" converter="omnifaces.SelectItemsConverter" required="true">
+                            <f:selectItems value="#{applicationView.allApplications}" var="app" itemLabel="#{app.applicationName}" itemValue="#{app}" />
+                        </p:selectOneMenu>
+                    </div>
+                    <div class="col-sm-12 col-md-2">
+                        <p:commandButton value="Select" styleClass="btn-primary btn-solid}" actionListener="#{applicationView.selectApplication}" />
+                    </div>
+                    <div class="col-sm-12 col-md-2">                        
+                        <p:commandButton value="New" id="newButton" icon="fa fa-plus" 
+                                         update="editDialog" oncomplete="PF('editDialogVar').show();"
+                                         actionListener="#{applicationView.newApplication}" styleClass="btn-teal btn-block" />
+                    </div>                    
+                    <div class="col-sm-12 col-md-2">   
+                        <p:commandButton id="deletePermissionButton" icon="fa fa-trash-o" value="#{msgs.button_delete}" actionListener="#{applicationView.deleteApplication}" 
+                                         update="applicationSelect" styleClass="btn-danger btn-block" >
+                            <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
+                        </p:commandButton>                
+                    </div>                
+
+                </div>                        
+                <composite:confirmationDialog />
+            </h:form>
+        </p:panel>
+
+        <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"
+                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
+            <h:form id="editDialogForm">
+                <p:messages id="editDialogMessages" showDetail="true" showIcon="true" showSummary="true">
+                    <p:autoUpdate />
+                </p:messages>
+
+                <div class="ui-g ui-fluid">
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="applicationName" value="Application name" />   
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:inputText id="applicationName" value="#{applicationView.editApplication.applicationName}">
+                            <f:validator validatorId="uniqueApplicationValidator"/>
+                        </p:inputText>
+                    </div>
+                    <div class="col-sm-12 col-md-3">                        
+                        <p:message for="applicationName"><p:autoUpdate /></p:message>
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Save" action="#{applicationView.saveEditApplication}" styleClass="btn-primary btn-block" 
+                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editDialogVar').hide();" update=":applicationForm" />
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Cancel" action="#{applicationView.cancelEditApplication}" immediate="true" styleClass="btn-teal btn-block"
+                                         oncomplete="PF('editDialogVar').hide();" />
+                    </div>
+
+
+                </div>
+            </h:form>
+        </p:dialog>
+
+    </ui:define>
+</ui:composition>

account-ui/src/main/webapp/web/index.xhtml

@@ -1,84 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:p="http://primefaces.org/ui"
+                template="/resources/template/template.xhtml">
-                template="/resources/template/template.xhtml"
-                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:co="http://java.sun.com/jsf/composite/composite"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-                xmlns:composite="http://xmlns.jcp.org/jsf/composite/composite">
     
     <ui:define name="title">
-        Applications
+        Home
     </ui:define>
 
     <ui:define name="body" >
-
+        Home         
-        <h:form id="applicationForm" prependId="false">           
-            <p:panel styleClass="box-solid">
-                <div class="ui-g ui-fluid">
-                    <div class="col-sm-12 col-md-6">
-                        <p:selectOneMenu id="applicationSelect" value="#{applicationView.currentApplication}" converter="omnifaces.SelectItemsConverter" required="true">
-                            <f:selectItems value="#{applicationView.allApplications}" var="app" itemLabel="#{app.applicationName}" itemValue="#{app}" />
-                        </p:selectOneMenu>
-                    </div>
-                    <div class="col-sm-12 col-md-2">
-                        <p:commandButton value="Select" styleClass="btn-primary btn-solid}" actionListener="#{applicationView.selectApplication}" />
-                    </div>
-                    <div class="col-sm-12 col-md-2">                        
-                        <p:commandButton value="New" id="newButton" icon="fa fa-plus" 
-                                         update="editDialog" oncomplete="PF('editDialogVar').show();"
-                                         actionListener="#{applicationView.newApplication}" styleClass="btn-teal btn-block" />
-                    </div>                    
-                    <div class="col-sm-12 col-md-2">   
-                        <p:commandButton id="deletePermissionButton" icon="fa fa-trash-o" value="#{msgs.button_delete}" actionListener="#{applicationView.deleteApplication}" 
-                                         update="applicationSelect" styleClass="btn-danger btn-block" >
-                            <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
-                        </p:commandButton>                
-                    </div>                
-                    
-                </div>
-            </p:panel>
-            
-            <composite:confirmationDialog />
-        </h:form>
-
-        <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"
-                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
-            <h:form id="editDialogForm">
-                <p:messages id="editDialogMessages" showDetail="true" showIcon="true" showSummary="true">
-                    <p:autoUpdate />
-                </p:messages>
-
-                <div class="ui-g ui-fluid">
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="applicationName" value="Application name" />   
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:inputText id="applicationName" value="#{applicationView.editApplication.applicationName}">
-                            <f:validator validatorId="uniqueApplicationValidator"/>
-                        </p:inputText>
-                    </div>
-                    <div class="col-sm-12 col-md-3">                        
-                        <p:message for="applicationName"><p:autoUpdate /></p:message>
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Save" action="#{applicationView.saveEditApplication}" styleClass="btn-primary btn-block" 
-                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editDialogVar').hide();" update=":applicationForm" />
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Cancel" action="#{applicationView.cancelEditApplication}" immediate="true" styleClass="btn-teal btn-block"
-                                         oncomplete="PF('editDialogVar').hide();" />
-                    </div>
-
-
-                </div>
-            </h:form>
-        </p:dialog>
-
     </ui:define>
 </ui:composition>

account-ui/src/main/webapp/web/permissions.xhtml

@@ -18,8 +18,8 @@
     </ui:define>
 
     <ui:define name="body">
+        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
             <h:form id="permissionForm">
-
                 <p:dataTable id="permissionTable" value="#{permissionView.appPermissions}" var="permission" rowKey="#{permission.id}"
                              selectionMode="single" selection="#{permissionView.currentPermission}" styleClass="box-primary">
                     <p:ajax event="rowSelect" update=":permissionForm:permissionTable:editPermissionButton,:permissionForm:permissionTable:deletePermissionButton"  />
@@ -51,8 +51,8 @@
                 </p:dataTable>
 
                 <composite:confirmationDialog />
-
             </h:form>
+        </p:panel>
 
 
         <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit permission" width="600"

account-ui/src/main/webapp/web/roles.xhtml

@@ -17,6 +17,7 @@
     </ui:define>
 
     <ui:define name="body">
+        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
             <h:form id="roleForm">
                 <p:dataTable id="roleTable" value="#{roleView.allRoles}" var="role" rowKey="#{role.id}" styleClass="box-primary"
                              selectionMode="single" selection="#{roleView.currentRole}">
@@ -83,8 +84,8 @@
                 </p:dataTable>
 
                 <composite:confirmationDialog />
-
             </h:form>
+        </p:panel>
 
         <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"
                   modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >