modified database, scripts, and web pages

src/java/DmWebPortal/web/views/userInfo/list.xhtml

@@ -14,7 +14,7 @@
         </div>
 
         <h:form id="viewUserInfoListForm">
-            <c:set var="entityController" value="#{userInfoController}"/>
+            <ui:param name="entityController" value="#{userInfoController}"/>
             <ui:include src="../common/commonListActionButtons.xhtml"/>
 
             <h:panelGroup>  

src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml

@@ -3,15 +3,14 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
+    <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
 
     <p:panelGrid columns="2" styleClass="createEntityDetails">
 
         <h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
-        <h:inputText id="username" value="#{userInfoObject.username}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
+        <h:inputText id="username" value="#{userInfoObject.username}" title="Username" styleClass="entityDataEmphasizedText"/>
 
         <h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
         <h:inputText id="lastName" value="#{userInfoObject.lastName}" title="Last Name" required="true" styleClass="entityDataText"/>

src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml

@@ -3,11 +3,10 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
-    <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+    <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
+    <ui:param name="isFieldWriteable" value="#{loginController.loggedIn}"/>
 
     <p:panelGrid columns="2" styleClass="editEntityDetails"> 
 

src/java/DmWebPortal/web/views/userInfo/userInfoListDataTable.xhtml

@@ -52,11 +52,10 @@
             <h:outputText value="#{userInfoObject.description}"/>
         </p:column>
         
-        <c:set var="isEntityWriteable" value="#{loginController.isUserWriteable(userInfoObject)}"/>
         <p:column headerText="Actions" width="70">
             <div class="actionLink">
                 <p:commandLink action="#{userInfoController.prepareView(userInfoObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
-                <p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+                <p:commandLink action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{loginController.isUserWriteable(userInfoObject)}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
                 <p:commandLink oncomplete="PF('userInfoDestroyDialogWidget').show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
                     <f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
                 </p:commandLink>

src/java/DmWebPortal/web/views/userInfo/userInfoViewPanelGrid.xhtml

@@ -3,10 +3,9 @@
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:h="http://java.sun.com/jsf/html"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-    <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
+    <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
 
     <p:panelGrid columns="2" styleClass="viewEntityDetails">
 

src/java/DmWebPortal/web/views/userInfo/view.xhtml

@@ -17,12 +17,11 @@
                 </div>
 
                 <ui:include src="userInfoViewPanelGrid.xhtml"/>
-                
+
                 <p/>
-                    <c:set var="userInfoObject" value="#{userInfoController.selected}"/>
-                <c:set var="isEntityWriteable" value="#{loginController.isUserWriteable(userInfoObject)}"/>
+                <ui:param name="userInfoObject" value="#{userInfoController.selected}"/>
                 <div class="actionButton">
-                    <p:commandButton action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{isEntityWriteable}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                    <p:commandButton action="#{userInfoController.prepareEdit(userInfoObject)}" rendered="#{loginController.isUserWriteable(userInfoObject)}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
                     <p:commandButton onclick="PF('userInfoDestroyDialogWidget').show();" rendered="#{loginController.loggedIn}" value="Delete" alt="Delete" icon="ui-icon-trash">
                         <f:setPropertyActionListener value="#{userInfoObject}" target="#{userInfoController.current}"/>
                     </p:commandButton>  
@@ -30,7 +29,7 @@
                 </div>
 
                 <ui:include src="userInfoDestroyDialog.xhtml"/>
-                
+
             </div>
 
         </h:form>

src/java/DmWebPortal/web/views/userSystemRole/systemRoleRemoveDialog.xhtml

@@ -2,8 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <ui:composition xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:p="http://primefaces.org/ui"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 
         <p:confirmDialog id="systemRoleRemoveDialog" message="Remove #{userSystemRoleController.getSystemRoleName()} Role for user #{userSystemRoleController.systemRoleTable.current.username}?"