Please cherry-pick:

- renamed feature 'user_name_required' to
  'user_login_requires_user_name' to make it more clear

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
index b2d6c5d3188c9f926f06bdb7d3532026b8bf4a36..ff88dc63dc2b69d9fd86b37f71cb65be27622292 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/PizzaUserWebSessionBean.java
@@ -804,7 +804,7 @@ public class PizzaUserWebSessionBean extends BasePizzaController implements Pizz
        @Override
        public boolean isUserNameRequired () {
                // Get context parameter
-               String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_name_required"); //NOI18N
+               String contextParameter = FacesContext.getCurrentInstance().getExternalContext().getInitParameter("is_user_login_require_user_name"); //NOI18N
 
                // Is it set?
                boolean isRequired = ((contextParameter instanceof String) && (contextParameter.toLowerCase().equals("true"))); //NOI18N

diff --git a/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java
index 408881e2d6ed13163d55e79d6873dda0d9786bd4..258a9133ad169c9f74a83e724a2ec67b394049b7 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/user/register/PizzaUserRegisterWebSessionBean.java
@@ -124,7 +124,7 @@ public class PizzaUserRegisterWebSessionBean extends BasePizzaController impleme
                } else if (!this.userController.isRequiredPersonalDataSet()) {
                        // Not all required fields are set
                        throw new FaceletException("Not all required fields are set."); //NOI18N
-               } else if ((this.featureController.isFeatureEnabled("user_name_required")) && (this.userController.isUserNameRegistered(user))) { //NOI18N
+               } else if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userController.isUserNameRegistered(user))) { //NOI18N
                        // Is multi-page enabled?
                        if (this.featureController.isFeatureEnabled("user_register_multiple_page")) { //NOI18N
                                // User name is already used, should not happen here
@@ -231,7 +231,7 @@ public class PizzaUserRegisterWebSessionBean extends BasePizzaController impleme
                if (null == user) {
                        // user must be set
                        throw new NullPointerException("user is null after createUserInstance() was called"); //NOI18N
-               } else if ((this.featureController.isFeatureEnabled("user_name_required")) && (this.userController.isUserNameRegistered(user))) { //NOI18N
+               } else if ((this.featureController.isFeatureEnabled("user_login_require_user_name")) && (this.userController.isUserNameRegistered(user))) { //NOI18N
                        // User name is already used, so clear it
                        this.userController.setUserName(null);
                        this.showFacesMessage("form_register_page1:userName", "ERROR_USER_NAME_ALREADY_USED"); //NOI18N

diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
index 52f1cc58c144b30568f037bfe224047f3523953c..53c83f28917cc8de0982312312b7a8df65e578e1 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -19,7 +19,7 @@
                        <h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
                </h:column>
 
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:column>
                                <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
 

diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index 42e57557ec531fc499d1f7e40be2111dbd22db41..c3a137cd139957b42eeef68ea9a124b91a39aac9 100644 (file)
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -23,7 +23,7 @@
                        </h:panelGroup>
                </h:column>
 
-               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:column>
                                <h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
 

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 1bc058f8a534ab161d6d9259133583958a2ed1e6..778b49465c208c8eefd7b0585ad65bcfbaa9d037 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -22,7 +22,7 @@
                        </div>
 
                        <ul>
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <li>
                                                <h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="user_login" value="#{msg.LINK_GUEST_LOGIN}" />
                                        </li>
@@ -34,7 +34,7 @@
                                        </li>
                                </ui:fragment>
 
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                                        <li>
                                                <h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="user_lost_password" value="#{msg.LINK_GUEST_PASSWORD}" />
                                        </li>

diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index cc8edcf362cfce6df68ade8afcf3ee9469306079..74f86eebebdfc7913d991cc16fdb2bde121dd397 100644 (file)
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -5,7 +5,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
        <div id="user_login_content">
-               <h:form id="form_user_login" rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+               <h:form id="form_user_login" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:panelGroup styleClass="table" layout="block">
                                <div class="table_header">
                                        <h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
@@ -56,7 +56,7 @@
                        </h:panelGroup>
                </h:form>
 
-               <h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
+               <h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
                        <h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
                </h:panelGroup>
        </div>

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 97af2dbae5cbca485903cd8adef778ff7b946322..e7f92540957f4a8cc9a590dcbcdf7b39e0733675 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -17,7 +17,7 @@
                                                <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
                                        </legend>
 
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left_medium">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
@@ -37,7 +37,7 @@
 
                                        <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
 
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <div class="para"></div>
 
                                                <h:panelGroup styleClass="table_row" layout="block">

diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index 7fb7d9c8e3a0f8b076d3fda56699957a6458202f..98f822df618c26f914d3a7d90b9a6866428685ff 100644 (file)
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -19,7 +19,7 @@
                                                <h:outputText value="#{msg.GUEST_REGISTRATION_EMAIL_LEGEND}" />
                                        </legend>
 
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <h:panelGroup styleClass="table_row" layout="block">
                                                        <div class="table_left">
                                                                <h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
@@ -39,7 +39,7 @@
 
                                        <ui:include src="/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl" />
 
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <div class="para"></div>
 
                                                <h:panelGroup styleClass="table_row" layout="block">

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index 6efce9f51685c8aae0a8ad0ae200be3b978ed0a9..41f49a3f20cbb26076eb36114d3b3568a47b0625 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     </context-param>
     <context-param>
         <description>Whether a user name is required for this application.</description>
-        <param-name>is_feature_user_name_required_enabled</param-name>
+        <param-name>is_feature_user_login_require_user_name_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>
@@ -113,13 +113,13 @@
         <param-value>false</param-value>
     </context-param>
     <context-param>
-        <description>Whether the public user profile is enabled. If this option is enabled, the setting "is_user_name_required" must also be enabled as it is mandadory.</description>
+        <description>Whether the public user profile is enabled. If this option is enabled, the setting "is_user_login_require_user_name" must also be enabled as it is mandadory.</description>
         <param-name>is_public_profile_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>
         <description>Whether user names are required for completing registration.</description>
-        <param-name>is_user_name_required</param-name>
+        <param-name>is_user_login_require_user_name</param-name>
         <param-value>true</param-value>
     </context-param>
     <context-param>

diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 9e714dc029b4e373017493041d6787f737c66c92..9d7ca70db7c3eb86469472f564f90e427371d831 100644 (file)
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -42,7 +42,7 @@
                                        </h:link>
                                </h:column>
 
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <h:column>
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />

diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 407caadadd478f95e6cef091083b2a731691142e..b44a9eee4e77ce670fab58d3eabbabb80092498d 100644 (file)
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -36,7 +36,7 @@
                                                </h:link>
                                        </p:column>
 
-                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                                <p:column>
                                                        <f:facet name="header">
                                                                <h:outputText value="#{msg.ADMIN_EXPORT_USER_NAME_TITLE}" />

diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 546c88281f77ea72bcc12b45fb3d6432911774f4..23890a9ae54138dd4a7d3bb6fc7379ac50d3b983 100644 (file)
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -36,7 +36,7 @@
                                        </h:link>
                                </h:column>
 
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <h:column>
                                                <f:facet name="header">
                                                        <h:outputText value="#{msg.ADMIN_LIST_USER_NAME}" />

diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index 94ea425cbce2df9bd064da28d312a45ff773fd36..8cae955a5236c31adfff11a462e067dd3842dd0b 100644 (file)
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -17,7 +17,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_registration')}">
                                        <h:outputText value="#{msg.GUEST_USER_NO_ACCOUNT_YET_QUESTION}" />
 
@@ -30,12 +30,12 @@
                                        <ui:include src="/WEB-INF/templates/guest/user/guest_login_form.tpl" />
                                </div>
 
-                               <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
+                               <h:panelGroup styleClass="para" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                                        <h:link id="user_lost_password" outcome="user_lost_password" title="#{msg.LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD}" value="#{msg.LINK_GUEST_LOGIN_LOST_PASSWORD}" />
                                </h:panelGroup>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
                                        <ui:param name="styleClass" value="errors" />

diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index a60a3f6360746b415c9134955b4ab6b896bb1aae..2de3ed1683aadd641c2b6588be2f87a466c6eff4 100644 (file)
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -18,7 +18,7 @@
                </ui:define>
 
                <ui:define name="content">
-                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required') and featureController.isFeatureEnabled('user_password_recovery')}">
+                       <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name') and featureController.isFeatureEnabled('user_password_recovery')}">
                                <div class="para" id="user_lost_password_content">
                                        <h:form id="form_lost_password">
                                                <h:panelGroup styleClass="table" layout="block">
@@ -70,7 +70,7 @@
                                </div>
                        </ui:fragment>
 
-                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
+                       <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}">
                                <ui:include src="/WEB-INF/templates/generic/message_box.tpl">
                                        <ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
                                        <ui:param name="styleClass" value="errors" />

diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 9e33b2c64fc5596e564a0d158e718c7bb012a9fd..61f08ed53f2a180b68f622f1b5d23523f4279d53 100644 (file)
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -18,7 +18,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration_in_index') and featureController.isFeatureEnabled('user_registration')}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <h:panelGroup styleClass="para" layout="block">
                                                <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
                                                <h:outputText value="&nbsp;" />

diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index fe89f8761095424e4739c76878fb3a126eb887f0..7e180037b408896f108300254f64ea267d442e7c 100644 (file)
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -19,7 +19,7 @@
 
                <ui:define name="content">
                        <ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
-                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
+                               <ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
                                        <div class="para">
                                                <h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
                                                <h:link outcome="user_login" value="#{msg.CLICK_HERE}" />