Please cherry-pick:

[jjobs-war.git] / web / WEB-INF / web.xml

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index edbe14739a0b52a4acdc7e46616852ae4a138921..ab9fb01d04e897e3276395909dcc2626b61335fb 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -12,6 +12,11 @@
         <param-name>javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE</param-name>
         <param-value>true</param-value>
     </context-param>
+    <context-param>
+        <description>All empty strings should be converted to null.</description>
+        <param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
+        <param-value>true</param-value>
+    </context-param>
     <context-param>
         <description>Whether the multi-page registration page or a single registration page is active</description>
         <param-name>is_feature_user_register_multiple_page_enabled</param-name>
@@ -19,7 +24,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>
@@ -43,7 +48,7 @@
         <param-value>true</param-value>
     </context-param>
     <context-param>
-        <description>Wether the personal title is required for using the general contact controller.</description>
+        <description>Whether the personal title is required for using the general contact controller.</description>
         <param-name>is_feature_general_personal_title_enabled</param-name>
         <param-value>true</param-value>
     </context-param>
@@ -99,9 +104,14 @@
     </context-param>
     <context-param>
         <description>Whether user can leave both passwords empty on registration.</description>
-        <param-name>allow_user_registration_empty_password</param-name>
+        <param-name>is_feature_allow_user_registration_empty_password_enabled</param-name>
         <param-value>false</param-value>
     </context-param>
+    <context-param>
+        <description>Whether business contacts are used in this project.</description>
+        <param-name>is_feature_business_contacts_enabled</param-name>
+        <param-value>true</param-value>
+    </context-param>
     <context-param>
         <description>Maximum passwords that must be different.</description>
         <param-name>max_user_password_history</param-name>
@@ -113,13 +123,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>