]> git.mxchange.org Git - jfinancials-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Mon, 17 Jul 2017 15:23:56 +0000 (17:23 +0200)
committerRoland Häder <roland@mxchange.org>
Mon, 17 Jul 2017 15:23:56 +0000 (17:23 +0200)
- 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>
21 files changed:
nbproject/project.properties
src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelperBean.java
src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java
src/java/org/mxchange/jfinancials/beans/user/register/FinancialsUserRegisterWebSessionBean.java
src/java/org/mxchange/jfinancials/converter/fax/FinancialsFaxNumberConverter.java
src/java/org/mxchange/jfinancials/converter/landline/FinancialsLandLineNumberConverter.java
src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileNumberConverter.java
web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/WEB-INF/templates/guest/user/guest_login_form.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
web/WEB-INF/web.xml
web/admin/user/admin_user_activity_log.xhtml
web/admin/user/admin_user_export.xhtml
web/admin/user/admin_user_list.xhtml
web/guest/user/user_login.xhtml
web/guest/user/user_lost_password.xhtml
web/guest/user/user_register.xhtml
web/guest/user/user_register_page2.xhtml

index 16d129371aa4e9707f3b5ce1ce60f331bf7dd0ea..46bff0be9902fee1733b5c830a0c1ec3be2c4534 100644 (file)
-annotation.processing.enabled=true\r
-annotation.processing.enabled.in.editor=true\r
-annotation.processing.processors.list=\r
-annotation.processing.run.all.processors=true\r
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output\r
-auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=\r
-auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false\r
-auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css\r
-auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=\r
-auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false\r
-auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css\r
-auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets\r
-auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs\r
-build.classes.dir=${build.web.dir}/WEB-INF/classes\r
-build.classes.excludes=**/*.java,**/*.form\r
-build.dir=build\r
-build.generated.dir=${build.dir}/generated\r
-build.generated.sources.dir=${build.dir}/generated-sources\r
-build.test.classes.dir=${build.dir}/test/classes\r
-build.test.results.dir=${build.dir}/test/results\r
-build.web.dir=${build.dir}/web\r
-build.web.excludes=${build.classes.excludes}\r
-client.urlPart=\r
-compile.jsps=false\r
-conf.dir=${source.root}/conf\r
-debug.classpath=${build.classes.dir}:${javac.classpath}\r
-debug.test.classpath=\\r
-    ${run.test.classpath}\r
-display.browser=true\r
-# Files to be excluded from distribution war\r
-dist.archive.excludes=\r
-dist.dir=dist\r
-dist.ear.war=${dist.dir}/${war.ear.name}\r
-dist.javadoc.dir=${dist.dir}/javadoc\r
-dist.war=${dist.dir}/${war.name}\r
-endorsed.classpath=\r
-excludes=\r
-file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar\r
-file.reference.cdi-api.jar=lib/cdi-api.jar\r
-file.reference.gf-client.jar=lib/gf-client.jar\r
-file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar\r
-file.reference.jcontacts-core.jar=lib/jcontacts-core.jar\r
-file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar\r
-file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar\r
-file.reference.jcoreee.jar=lib/jcoreee.jar\r
-file.reference.jcountry-core.jar=lib/jcountry-core.jar\r
-file.reference.jcountry-lib.jar=lib/jcountry-lib.jar\r
-file.reference.jphone-core.jar=lib/jphone-core.jar\r
-file.reference.jphone-lib.jar=lib/jphone-lib.jar\r
-file.reference.jproduct-core.jar=lib/jproduct-core.jar\r
-file.reference.juser-core.jar=lib/juser-core.jar\r
-file.reference.juser-lib.jar=lib/juser-lib.jar\r
-file.reference.juser-login-core.jar=lib/juser-login-core.jar\r
-file.reference.juser-login-lib.jar=lib/juser-login-lib.jar\r
-includes=**\r
-j2ee.compile.on.save=true\r
-j2ee.copy.static.files.on.save=true\r
-j2ee.deploy.on.save=true\r
-j2ee.platform=1.7-web\r
-j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar\r
-j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar\r
-j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar\r
-j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar\r
-j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar\r
-j2ee.platform.wsit.classpath=\r
-j2ee.server.type=gfv3ee6\r
-jar.compress=false\r
-javac.classpath=\\r
-    ${file.reference.jcoreee.jar}:\\r
-    ${file.reference.jcore-logger-lib.jar}:\\r
-    ${file.reference.jcountry-core.jar}:\\r
-    ${file.reference.jcountry-lib.jar}:\\r
-    ${file.reference.jcontacts-core.jar}:\\r
-    ${file.reference.jcontacts-business-core.jar}:\\r
-    ${file.reference.jcontacts-business-lib.jar}:\\r
-    ${file.reference.jproduct-core.jar}:\\r
-    ${file.reference.jcontacts-lib.jar}:\\r
-    ${file.reference.jphone-core.jar}:\\r
-    ${file.reference.jphone-lib.jar}:\\r
-    ${file.reference.juser-core.jar}:\\r
-    ${file.reference.juser-lib.jar}:\\r
-    ${file.reference.juser-login-core.jar}:\\r
-    ${file.reference.juser-login-lib.jar}:\\r
-    ${reference.jfinancials-core.jar}:\\r
-    ${reference.jfinancials-lib.jar}:\\r
-    ${file.reference.cdi-api.jar}:\\r
-    ${file.reference.gf-client.jar}:\\r
-    ${libs.Apache_POI_3.15.classpath}:\\r
-    ${libs.primefaces.classpath}\r
-# Space-separated list of extra javac options\r
-javac.compilerargs=-Xlint:unchecked -Xlint:deprecation\r
-javac.debug=true\r
-javac.deprecation=true\r
-javac.processorpath=\\r
-    ${javac.classpath}\r
-javac.source=1.7\r
-javac.target=1.7\r
-javac.test.classpath=\\r
-    ${javac.classpath}:\\r
-    ${build.classes.dir}\r
-javac.test.processorpath=\\r
-    ${javac.test.classpath}\r
-javadoc.additionalparam=\r
-javadoc.author=true\r
-javadoc.encoding=${source.encoding}\r
-javadoc.noindex=false\r
-javadoc.nonavbar=false\r
-javadoc.notree=false\r
-javadoc.preview=true\r
-javadoc.private=true\r
-javadoc.reference.cdi-api.jar=https://docs.oracle.com/javaee/7/api/\r
-javadoc.splitindex=true\r
-javadoc.use=true\r
-javadoc.version=true\r
-javadoc.windowtitle=JFinancials Web Application\r
-lib.dir=${web.docbase.dir}/WEB-INF/lib\r
-persistence.xml.dir=${conf.dir}\r
-platform.active=default_platform\r
-project.jfinancials-core=../../NetBeansProjects/jfinancials-core\r
-project.jfinancials-lib=../jfinancials-lib\r
-project.license=agpl30\r
-reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar\r
-reference.jfinancials-lib.jar=${project.jfinancials-lib}/dist/jfinancials-lib.jar\r
-resource.dir=setup\r
-run.test.classpath=\\r
-    ${javac.test.classpath}:\\r
-    ${build.test.classes.dir}\r
-# Space-separated list of JVM arguments used when running a class with a main method or a unit test\r
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):\r
-runmain.jvmargs=\r
-source.encoding=UTF-8\r
-source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/\r
-source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src/\r
-source.reference.jcontacts-core.jar=../jcontacts-core/src/\r
-source.reference.jcontacts-lib.jar=../jcontacts-lib/src/\r
-source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/\r
-source.reference.jcoreee.jar=../jcoreee/src/\r
-source.reference.jcountry-core.jar=../jcountry-core/src/\r
-source.reference.jcountry-lib.jar=../jcountry-lib/src/\r
-source.reference.jphone-core.jar=../jphone-core/src/\r
-source.reference.jphone-lib.jar=../jphone-lib/src/\r
-source.reference.jproduct-core.jar=../jproduct-core/src/\r
-source.reference.juser-core.jar=../juser-core/src/\r
-source.reference.juser-lib.jar=../juser-lib/src/\r
-source.reference.juser-login-core.jar=../juser-login-core/src/\r
-source.reference.juser-login-lib.jar=../juser-login-lib/src/\r
-source.root=src\r
-src.dir=${source.root}/java\r
-test.src.dir=test\r
-war.content.additional=\r
-war.ear.name=${war.name}\r
-war.name=jfinancials-war.war\r
-web.docbase.dir=web\r
-webinf.dir=web/WEB-INF\r
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
+auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
+auxiliary.org-netbeans-modules-projectapi.jsf_2e_language=Facelets
+auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
+build.classes.dir=${build.web.dir}/WEB-INF/classes
+build.classes.excludes=**/*.java,**/*.form
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+build.web.dir=${build.dir}/web
+build.web.excludes=${build.classes.excludes}
+client.urlPart=
+compile.jsps=false
+conf.dir=${source.root}/conf
+debug.classpath=${build.classes.dir}:${javac.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+display.browser=true
+# Files to be excluded from distribution war
+dist.archive.excludes=
+dist.dir=dist
+dist.ear.war=${dist.dir}/${war.ear.name}
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.war=${dist.dir}/${war.name}
+endorsed.classpath=
+excludes=
+file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
+file.reference.cdi-api.jar=lib/cdi-api.jar
+file.reference.gf-client.jar=lib/gf-client.jar
+file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
+file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
+file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
+file.reference.jcoreee.jar=lib/jcoreee.jar
+file.reference.jcountry-core.jar=lib/jcountry-core.jar
+file.reference.jcountry-lib.jar=lib/jcountry-lib.jar
+file.reference.jphone-core.jar=lib/jphone-core.jar
+file.reference.jphone-lib.jar=lib/jphone-lib.jar
+file.reference.jproduct-core.jar=lib/jproduct-core.jar
+file.reference.juser-core.jar=lib/juser-core.jar
+file.reference.juser-lib.jar=lib/juser-lib.jar
+file.reference.juser-login-core.jar=lib/juser-login-core.jar
+file.reference.juser-login-lib.jar=lib/juser-login-lib.jar
+includes=**
+j2ee.compile.on.save=true
+j2ee.copy.static.files.on.save=true
+j2ee.deploy.on.save=true
+j2ee.platform=1.7-web
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
+j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
+j2ee.platform.wsit.classpath=
+j2ee.server.type=gfv3ee6
+jar.compress=false
+javac.classpath=\
+    ${file.reference.jcoreee.jar}:\
+    ${file.reference.jcore-logger-lib.jar}:\
+    ${file.reference.jcountry-core.jar}:\
+    ${file.reference.jcountry-lib.jar}:\
+    ${file.reference.jcontacts-core.jar}:\
+    ${file.reference.jcontacts-business-core.jar}:\
+    ${file.reference.jcontacts-business-lib.jar}:\
+    ${file.reference.jproduct-core.jar}:\
+    ${file.reference.jcontacts-lib.jar}:\
+    ${file.reference.jphone-core.jar}:\
+    ${file.reference.jphone-lib.jar}:\
+    ${file.reference.juser-core.jar}:\
+    ${file.reference.juser-lib.jar}:\
+    ${file.reference.juser-login-core.jar}:\
+    ${file.reference.juser-login-lib.jar}:\
+    ${reference.jfinancials-core.jar}:\
+    ${reference.jfinancials-lib.jar}:\
+    ${file.reference.cdi-api.jar}:\
+    ${file.reference.gf-client.jar}:\
+    ${libs.Apache_POI_3.15.classpath}:\
+    ${libs.primefaces.classpath}
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
+javac.debug=true
+javac.deprecation=true
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.7
+javac.target=1.7
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=true
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.preview=true
+javadoc.private=true
+javadoc.reference.cdi-api.jar=https://docs.oracle.com/javaee/7/api/
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=true
+javadoc.windowtitle=JFinancials Web Application
+lib.dir=${web.docbase.dir}/WEB-INF/lib
+persistence.xml.dir=${conf.dir}
+platform.active=default_platform
+project.jfinancials-core=../../NetBeansProjects/jfinancials-core
+project.jfinancials-lib=../jfinancials-lib
+project.license=agpl30
+reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar
+reference.jfinancials-lib.jar=${project.jfinancials-lib}/dist/jfinancials-lib.jar
+resource.dir=setup
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+# Space-separated list of JVM arguments used when running a class with a main method or a unit test
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
+runmain.jvmargs=
+source.encoding=UTF-8
+source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
+source.reference.jcontacts-business-lib.jar=../jcontacts-business-lib/src/
+source.reference.jcontacts-core.jar=../jcontacts-core/src/
+source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
+source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
+source.reference.jcoreee.jar=../jcoreee/src/
+source.reference.jcountry-core.jar=../jcountry-core/src/
+source.reference.jcountry-lib.jar=../jcountry-lib/src/
+source.reference.jphone-core.jar=../jphone-core/src/
+source.reference.jphone-lib.jar=../jphone-lib/src/
+source.reference.jproduct-core.jar=../jproduct-core/src/
+source.reference.juser-core.jar=../juser-core/src/
+source.reference.juser-lib.jar=../juser-lib/src/
+source.reference.juser-login-core.jar=../juser-login-core/src/
+source.reference.juser-login-lib.jar=../juser-login-lib/src/
+source.root=src
+src.dir=${source.root}/java
+test.src.dir=test
+war.content.additional=
+war.ear.name=${war.name}
+war.name=jfinancials-war.war
+web.docbase.dir=web
+webinf.dir=web/WEB-INF
index 4bdd8372697960fdc75b613f86b3832ec1ea70de..d2c476022a538b2084c8a296202dff69c8167fe2 100644 (file)
-/*\r
- * Copyright (C) 2016, 2017 Roland Häder GmbH\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU Affero General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Affero General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jfinancials.beans.helper;\r
-\r
-import java.text.MessageFormat;\r
-import javax.enterprise.context.RequestScoped;\r
-import javax.inject.Inject;\r
-import javax.inject.Named;\r
-import org.mxchange.jcontacts.contact.Contact;\r
-import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController;\r
-import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;\r
-import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;\r
-import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;\r
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;\r
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;\r
-import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;\r
-import org.mxchange.jusercore.model.user.User;\r
-\r
-/**\r
- * A general helper for beans\r
- * <p>\r
- * @author Roland Häder<roland@mxchange.org>\r
- */\r
-@Named ("beanHelper")\r
-@RequestScoped\r
-public class FinancialsWebRequestHelperBean implements FinancialsWebRequestHelperController {\r
-\r
-       /**\r
-        * Call-stack instance (5 may show BeanELResolver.getValue as caller)\r
-        */\r
-       private static final short THREAD_STACK = 5;\r
-\r
-       /**\r
-        * Serial number\r
-        */\r
-       private static final long serialVersionUID = 17_258_793_567_145_701L;\r
-\r
-       /**\r
-        * Administrative contact controller\r
-        */\r
-       @Inject\r
-       private FinancialsAdminContactWebRequestController adminContactController;\r
-\r
-       /**\r
-        * Administrative phone controller\r
-        */\r
-       @Inject\r
-       private FinancialsAdminPhoneWebRequestController adminPhoneController;\r
-\r
-       /**\r
-        * Administrative user controller\r
-        */\r
-       @Inject\r
-       private FinancialsAdminUserWebRequestController adminUserController;\r
-\r
-       /**\r
-        * Contact instance\r
-        */\r
-       private Contact contact;\r
-\r
-       /**\r
-        * Fax number\r
-        */\r
-       private DialableFaxNumber faxNumber;\r
-\r
-       /**\r
-        * Land-line number\r
-        */\r
-       private DialableLandLineNumber landLineNumber;\r
-\r
-       /**\r
-        * Mobile number\r
-        */\r
-       private DialableMobileNumber mobileNumber;\r
-\r
-       /**\r
-        * User instance\r
-        */\r
-       private User user;\r
-\r
-       /**\r
-        * Regular user controller\r
-        */\r
-       @Inject\r
-       private FinancialsUserWebSessionController userController;\r
-\r
-       /**\r
-        * Default constructor\r
-        */\r
-       public FinancialsWebRequestHelperBean () {\r
-               // Call super constructor\r
-               super();\r
-\r
-               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName());\r
-               // System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller));\r
-       }\r
-\r
-       @Override\r
-       public void copyContactToController () {\r
-               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());\r
-               // System.out.println(MessageFormat.format("{0}.copyContactToController: CALLED, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));\r
-\r
-               // Validate contact instance\r
-               if (this.getContact() == null) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("this.contact is null"); //NOI18N\r
-               } else if (this.getContact().getContactId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("this.contact.contactId is null"); //NOI18N\r
-               } else if (this.getContact().getContactId() < 1) {\r
-                       // Not valid\r
-                       throw new IllegalStateException(MessageFormat.format("this.contact.contactId={0} is not valid.", this.getContact().getContactId())); //NOI18N\r
-               }\r
-\r
-               // Set all phone instances\r
-               this.setPhoneInstances(this.getContact());\r
-\r
-               // Set all fields: user\r
-               this.adminContactController.copyContactToController(this.getContact());\r
-       }\r
-\r
-       @Override\r
-       public void copyFaxNumberToController () {\r
-               // Validate fax instance\r
-               if (this.getFaxNumber() == null) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("this.faxNumber is null");\r
-               } else if (this.getFaxNumber().getPhoneId() == null) {\r
-                       // Throw again\r
-                       throw new NullPointerException("this.faxNumber.phoneId is null");\r
-               } else if (this.getFaxNumber().getPhoneId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneId={0} is not valid", this.getFaxNumber().getPhoneId()));\r
-               } else if (this.getFaxNumber().getPhoneAreaCode() == null) {\r
-                       // Throw again\r
-                       throw new NullPointerException("this.faxNumber.phoneAreaCode is null");\r
-               } else if (this.getFaxNumber().getPhoneAreaCode() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneAreaCode={0} is not valid", this.getFaxNumber().getPhoneAreaCode()));\r
-               } else if (this.getFaxNumber().getPhoneCountry() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("this.faxNumber.phoneCountry is null");\r
-               } else if (this.getFaxNumber().getPhoneCountry().getCountryId() == null) {\r
-                       // ... throw again\r
-                       throw new NullPointerException("this.faxNumber.phoneCountry.countryId is null");\r
-               } else if (this.getFaxNumber().getPhoneCountry().getCountryId() < 1) {\r
-                       // Invalid id\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneCountry.countryId={0} is invalid", this.getFaxNumber().getPhoneCountry().getCountryId()));\r
-               } else if (this.getFaxNumber().getPhoneNumber() == null) {\r
-                       // Throw NPE again ...\r
-                       throw new NullPointerException("this.faxNumber.phoneNumber is null");\r
-               } else if (this.getFaxNumber().getPhoneNumber() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneNumber={0} is not valid", this.getFaxNumber().getPhoneNumber()));\r
-               }\r
-\r
-               // Copy all (changeable) data fields to admin controller\r
-               this.adminPhoneController.setPhoneAreaCode(this.getFaxNumber().getPhoneAreaCode());\r
-               this.adminPhoneController.setPhoneCountry(this.getFaxNumber().getPhoneCountry());\r
-               this.adminPhoneController.setPhoneNumber(this.getFaxNumber().getPhoneNumber());\r
-       }\r
-\r
-       @Override\r
-       public void copyLandLineNumberToController () {\r
-               // Validate land-line instance\r
-               if (this.getLandLineNumber() == null) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("this.landLineNumber is null");\r
-               } else if (this.getLandLineNumber().getPhoneId() == null) {\r
-                       // Throw again\r
-                       throw new NullPointerException("this.landLineNumber.phoneId is null");\r
-               } else if (this.getLandLineNumber().getPhoneId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneId={0} is not valid", this.getLandLineNumber().getPhoneId()));\r
-               } else if (this.getLandLineNumber().getPhoneAreaCode() == null) {\r
-                       // Throw again\r
-                       throw new NullPointerException("this.landLineNumber.phoneAreaCode is null");\r
-               } else if (this.getLandLineNumber().getPhoneAreaCode() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneAreaCode={0} is not valid", this.getFaxNumber().getPhoneAreaCode()));\r
-               } else if (this.getLandLineNumber().getPhoneCountry() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("this.landLineNumber.phoneCountry is null");\r
-               } else if (this.getLandLineNumber().getPhoneCountry().getCountryId() == null) {\r
-                       // ... throw again\r
-                       throw new NullPointerException("this.landLineNumber.phoneCountry.countryId is null");\r
-               } else if (this.getLandLineNumber().getPhoneCountry().getCountryId() < 1) {\r
-                       // Invalid id\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneCountry.countryId={0} is invalid", this.getLandLineNumber().getPhoneCountry().getCountryId()));\r
-               } else if (this.getLandLineNumber().getPhoneNumber() == null) {\r
-                       // Throw NPE again ...\r
-                       throw new NullPointerException("this.landLineNumber.phoneNumber is null");\r
-               } else if (this.getLandLineNumber().getPhoneNumber() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneNumber={0} is not valid", this.getLandLineNumber().getPhoneNumber()));\r
-               }\r
-\r
-               // Copy all (changeable) data fields to admin controller\r
-               this.adminPhoneController.setPhoneAreaCode(this.getLandLineNumber().getPhoneAreaCode());\r
-               this.adminPhoneController.setPhoneCountry(this.getLandLineNumber().getPhoneCountry());\r
-               this.adminPhoneController.setPhoneNumber(this.getLandLineNumber().getPhoneNumber());\r
-       }\r
-\r
-       @Override\r
-       public void copyMobileNumberToController () {\r
-               // Validate mobile instance\r
-               if (this.getMobileNumber() == null) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("this.mobileNumber is null");\r
-               } else if (this.getMobileNumber().getPhoneId() == null) {\r
-                       // Throw again\r
-                       throw new NullPointerException("this.mobileNumber.phoneId is null");\r
-               } else if (this.getMobileNumber().getPhoneId() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneId={0} is not valid", this.getMobileNumber().getPhoneId()));\r
-               } else if (this.getMobileNumber().getMobileProvider() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("this.mobileNumber.mobileProvider is null");\r
-               } else if (this.getMobileNumber().getMobileProvider().getProviderId() == null) {\r
-                       // ... throw again\r
-                       throw new NullPointerException("this.mobileNumber.mobileProvider.providerId is null");\r
-               } else if (this.getMobileNumber().getMobileProvider().getProviderId() < 1) {\r
-                       // Invalid id\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.mobileProvider.providerId={0} is invalid", this.getMobileNumber().getMobileProvider().getProviderId()));\r
-               } else if (this.getMobileNumber().getPhoneNumber() == null) {\r
-                       // Throw NPE again ...\r
-                       throw new NullPointerException("this.mobileNumber.phoneNumber is null");\r
-               } else if (this.getMobileNumber().getPhoneNumber() < 1) {\r
-                       // Invalid id number\r
-                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneNumber={0} is not valid", this.getMobileNumber().getPhoneNumber()));\r
-               }\r
-\r
-               // Copy all (changeable) data fields to admin controller\r
-               this.adminPhoneController.setMobileProvider(this.getMobileNumber().getMobileProvider());\r
-               this.adminPhoneController.setPhoneNumber(this.getMobileNumber().getPhoneNumber());\r
-       }\r
-\r
-       @Override\r
-       public void copyUserToController () {\r
-               // Log message\r
-               //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - CALLED!"); //NOI18N\r
-\r
-               // Validate user instance\r
-               if (this.getUser() == null) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("this.user is null"); //NOI18N\r
-               } else if (this.getUser().getUserId() == null) {\r
-                       // Throw NPE again\r
-                       throw new NullPointerException("this.user.userId is null"); //NOI18N\r
-               } else if (this.getUser().getUserId() < 1) {\r
-                       // Not valid\r
-                       throw new IllegalStateException(MessageFormat.format("this.user.userId={0} is not valid.", this.getUser().getUserId())); //NOI18N\r
-               }\r
-\r
-               // Get contact\r
-               Contact userContact = this.getUser().getUserContact();\r
-\r
-               // Set contact here, too. This avoids parameters that cannot auto-complete in IDEs.\r
-               this.setContact(userContact);\r
-\r
-               // Set all phone instances\r
-               this.setPhoneInstances(userContact);\r
-\r
-               // Set all fields: user\r
-               this.userController.setUserName(this.getUser().getUserName());\r
-               this.adminUserController.setUserName(this.getUser().getUserName());\r
-       }\r
-\r
-       @Override\r
-       public Contact getContact () {\r
-               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());\r
-               // System.out.println(MessageFormat.format("{0}: Returning this.contact={1}, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));\r
-               return this.contact;\r
-       }\r
-\r
-       @Override\r
-       public void setContact (final Contact contact) {\r
-               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());\r
-               // System.out.println(MessageFormat.format("{0}: Setting contact={1}, previous: {2}, caller: {3}", this.getClass().getSimpleName(), contact, this.contact, caller));\r
-               this.contact = contact;\r
-       }\r
-\r
-       @Override\r
-       public String getContactUsageMessageKey (final Contact contact) {\r
-               // The contact must be valid\r
-               if (null == contact) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("contact is null"); //NOI18N\r
-               } else if (contact.getContactId() == null) {\r
-                       // Throw again ...\r
-                       throw new NullPointerException("contact.contactId is null"); //NOI18N\r
-               } else if (contact.getContactId() < 1) {\r
-                       // Not valid\r
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N\r
-               }\r
-\r
-               // Default key is "unused"\r
-               String messageKey = "CONTACT_IS_UNUSED"; //NOI18N\r
-\r
-               // Check user contact\r
-               boolean isUserContact = this.userController.isContactFound(contact);\r
-\r
-               // Check user first\r
-               if (isUserContact) {\r
-                       // Only user\r
-                       messageKey = "CONTACT_IS_USER"; //NOI18N\r
-               }\r
-\r
-               // Return message key\r
-               return messageKey;\r
-       }\r
-\r
-       @Override\r
-       public DialableFaxNumber getFaxNumber () {\r
-               return this.faxNumber;\r
-       }\r
-\r
-       @Override\r
-       public void setFaxNumber (final DialableFaxNumber faxNumber) {\r
-               this.faxNumber = faxNumber;\r
-       }\r
-\r
-       @Override\r
-       public DialableLandLineNumber getLandLineNumber () {\r
-               return this.landLineNumber;\r
-       }\r
-\r
-       @Override\r
-       public void setLandLineNumber (final DialableLandLineNumber landLineNumber) {\r
-               this.landLineNumber = landLineNumber;\r
-       }\r
-\r
-       @Override\r
-       public DialableMobileNumber getMobileNumber () {\r
-               return this.mobileNumber;\r
-       }\r
-\r
-       @Override\r
-       public void setMobileNumber (final DialableMobileNumber mobileNumber) {\r
-               this.mobileNumber = mobileNumber;\r
-       }\r
-\r
-       @Override\r
-       public User getUser () {\r
-               return this.user;\r
-       }\r
-\r
-       @Override\r
-       public void setUser (final User user) {\r
-               this.user = user;\r
-       }\r
-\r
-       /**\r
-        * Set's all given contact's phone instances: land-line, mobile and\r
-        * faxNumber\r
-        * <p>\r
-        * @param contact Contact to set phone instances for\r
-        */\r
-       private void setPhoneInstances (final Contact contact) {\r
-               // The contact must be valid\r
-               if (null == contact) {\r
-                       // Throw NPE\r
-                       throw new NullPointerException("contact is null"); //NOI18N\r
-               } else if (contact.getContactId() == null) {\r
-                       // Throw again ...\r
-                       throw new NullPointerException("contact.contactId is null"); //NOI18N\r
-               } else if (contact.getContactId() < 1) {\r
-                       // Not valid\r
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N\r
-               }\r
-\r
-               // Is mobile set?\r
-               if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {\r
-                       // Yes, then set it in admin controller\r
-                       this.setMobileNumber(contact.getContactMobileNumber());\r
-               }\r
-\r
-               // Is land-line set?\r
-               if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {\r
-                       // Yes, then set it in admin controller\r
-                       this.setLandLineNumber(contact.getContactLandLineNumber());\r
-               }\r
-\r
-               // Is faxNumber set?\r
-               if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {\r
-                       // Yes, then set it in admin controller\r
-                       this.setFaxNumber(contact.getContactFaxNumber());\r
-               }\r
-       }\r
-\r
-}\r
+/*
+ * Copyright (C) 2016, 2017 Roland Häder GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.beans.helper;
+
+import java.text.MessageFormat;
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.inject.Named;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController;
+import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController;
+import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController;
+import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jusercore.model.user.User;
+
+/**
+ * A general helper for beans
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@Named ("beanHelper")
+@RequestScoped
+public class FinancialsWebRequestHelperBean implements FinancialsWebRequestHelperController {
+
+       /**
+        * Call-stack instance (5 may show BeanELResolver.getValue as caller)
+        */
+       private static final short THREAD_STACK = 5;
+
+       /**
+        * Serial number
+        */
+       private static final long serialVersionUID = 17_258_793_567_145_701L;
+
+       /**
+        * Administrative contact controller
+        */
+       @Inject
+       private FinancialsAdminContactWebRequestController adminContactController;
+
+       /**
+        * Administrative phone controller
+        */
+       @Inject
+       private FinancialsAdminPhoneWebRequestController adminPhoneController;
+
+       /**
+        * Administrative user controller
+        */
+       @Inject
+       private FinancialsAdminUserWebRequestController adminUserController;
+
+       /**
+        * Contact instance
+        */
+       private Contact contact;
+
+       /**
+        * Fax number
+        */
+       private DialableFaxNumber faxNumber;
+
+       /**
+        * Land-line number
+        */
+       private DialableLandLineNumber landLineNumber;
+
+       /**
+        * Mobile number
+        */
+       private DialableMobileNumber mobileNumber;
+
+       /**
+        * User instance
+        */
+       private User user;
+
+       /**
+        * Regular user controller
+        */
+       @Inject
+       private FinancialsUserWebSessionController userController;
+
+       /**
+        * Default constructor
+        */
+       public FinancialsWebRequestHelperBean () {
+               // Call super constructor
+               super();
+
+               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[3].getClassName(), Thread.currentThread().getStackTrace()[3].getMethodName());
+               // System.out.println(MessageFormat.format("{0}: Constructed, caller: {1}", this.getClass().getSimpleName(), caller));
+       }
+
+       @Override
+       public void copyContactToController () {
+               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               // System.out.println(MessageFormat.format("{0}.copyContactToController: CALLED, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));
+
+               // Validate contact instance
+               if (this.getContact() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.contact is null"); //NOI18N
+               } else if (this.getContact().getContactId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.contact.contactId is null"); //NOI18N
+               } else if (this.getContact().getContactId() < 1) {
+                       // Not valid
+                       throw new IllegalStateException(MessageFormat.format("this.contact.contactId={0} is not valid.", this.getContact().getContactId())); //NOI18N
+               }
+
+               // Set all phone instances
+               this.setPhoneInstances(this.getContact());
+
+               // Set all fields: user
+               this.adminContactController.copyContactToController(this.getContact());
+       }
+
+       @Override
+       public void copyFaxNumberToController () {
+               // Validate fax instance
+               if (this.getFaxNumber() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.faxNumber is null");
+               } else if (this.getFaxNumber().getPhoneId() == null) {
+                       // Throw again
+                       throw new NullPointerException("this.faxNumber.phoneId is null");
+               } else if (this.getFaxNumber().getPhoneId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneId={0} is not valid", this.getFaxNumber().getPhoneId()));
+               } else if (this.getFaxNumber().getPhoneAreaCode() == null) {
+                       // Throw again
+                       throw new NullPointerException("this.faxNumber.phoneAreaCode is null");
+               } else if (this.getFaxNumber().getPhoneAreaCode() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneAreaCode={0} is not valid", this.getFaxNumber().getPhoneAreaCode()));
+               } else if (this.getFaxNumber().getPhoneCountry() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.faxNumber.phoneCountry is null");
+               } else if (this.getFaxNumber().getPhoneCountry().getCountryId() == null) {
+                       // ... throw again
+                       throw new NullPointerException("this.faxNumber.phoneCountry.countryId is null");
+               } else if (this.getFaxNumber().getPhoneCountry().getCountryId() < 1) {
+                       // Invalid id
+                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneCountry.countryId={0} is invalid", this.getFaxNumber().getPhoneCountry().getCountryId()));
+               } else if (this.getFaxNumber().getPhoneNumber() == null) {
+                       // Throw NPE again ...
+                       throw new NullPointerException("this.faxNumber.phoneNumber is null");
+               } else if (this.getFaxNumber().getPhoneNumber() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.faxNumber.phoneNumber={0} is not valid", this.getFaxNumber().getPhoneNumber()));
+               }
+
+               // Copy all (changeable) data fields to admin controller
+               this.adminPhoneController.setPhoneAreaCode(this.getFaxNumber().getPhoneAreaCode());
+               this.adminPhoneController.setPhoneCountry(this.getFaxNumber().getPhoneCountry());
+               this.adminPhoneController.setPhoneNumber(this.getFaxNumber().getPhoneNumber());
+       }
+
+       @Override
+       public void copyLandLineNumberToController () {
+               // Validate land-line instance
+               if (this.getLandLineNumber() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.landLineNumber is null");
+               } else if (this.getLandLineNumber().getPhoneId() == null) {
+                       // Throw again
+                       throw new NullPointerException("this.landLineNumber.phoneId is null");
+               } else if (this.getLandLineNumber().getPhoneId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneId={0} is not valid", this.getLandLineNumber().getPhoneId()));
+               } else if (this.getLandLineNumber().getPhoneAreaCode() == null) {
+                       // Throw again
+                       throw new NullPointerException("this.landLineNumber.phoneAreaCode is null");
+               } else if (this.getLandLineNumber().getPhoneAreaCode() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneAreaCode={0} is not valid", this.getFaxNumber().getPhoneAreaCode()));
+               } else if (this.getLandLineNumber().getPhoneCountry() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.landLineNumber.phoneCountry is null");
+               } else if (this.getLandLineNumber().getPhoneCountry().getCountryId() == null) {
+                       // ... throw again
+                       throw new NullPointerException("this.landLineNumber.phoneCountry.countryId is null");
+               } else if (this.getLandLineNumber().getPhoneCountry().getCountryId() < 1) {
+                       // Invalid id
+                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneCountry.countryId={0} is invalid", this.getLandLineNumber().getPhoneCountry().getCountryId()));
+               } else if (this.getLandLineNumber().getPhoneNumber() == null) {
+                       // Throw NPE again ...
+                       throw new NullPointerException("this.landLineNumber.phoneNumber is null");
+               } else if (this.getLandLineNumber().getPhoneNumber() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.landLineNumber.phoneNumber={0} is not valid", this.getLandLineNumber().getPhoneNumber()));
+               }
+
+               // Copy all (changeable) data fields to admin controller
+               this.adminPhoneController.setPhoneAreaCode(this.getLandLineNumber().getPhoneAreaCode());
+               this.adminPhoneController.setPhoneCountry(this.getLandLineNumber().getPhoneCountry());
+               this.adminPhoneController.setPhoneNumber(this.getLandLineNumber().getPhoneNumber());
+       }
+
+       @Override
+       public void copyMobileNumberToController () {
+               // Validate mobile instance
+               if (this.getMobileNumber() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.mobileNumber is null");
+               } else if (this.getMobileNumber().getPhoneId() == null) {
+                       // Throw again
+                       throw new NullPointerException("this.mobileNumber.phoneId is null");
+               } else if (this.getMobileNumber().getPhoneId() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneId={0} is not valid", this.getMobileNumber().getPhoneId()));
+               } else if (this.getMobileNumber().getMobileProvider() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.mobileNumber.mobileProvider is null");
+               } else if (this.getMobileNumber().getMobileProvider().getProviderId() == null) {
+                       // ... throw again
+                       throw new NullPointerException("this.mobileNumber.mobileProvider.providerId is null");
+               } else if (this.getMobileNumber().getMobileProvider().getProviderId() < 1) {
+                       // Invalid id
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.mobileProvider.providerId={0} is invalid", this.getMobileNumber().getMobileProvider().getProviderId()));
+               } else if (this.getMobileNumber().getPhoneNumber() == null) {
+                       // Throw NPE again ...
+                       throw new NullPointerException("this.mobileNumber.phoneNumber is null");
+               } else if (this.getMobileNumber().getPhoneNumber() < 1) {
+                       // Invalid id number
+                       throw new IllegalArgumentException(MessageFormat.format("this.mobileNumber.phoneNumber={0} is not valid", this.getMobileNumber().getPhoneNumber()));
+               }
+
+               // Copy all (changeable) data fields to admin controller
+               this.adminPhoneController.setMobileProvider(this.getMobileNumber().getMobileProvider());
+               this.adminPhoneController.setPhoneNumber(this.getMobileNumber().getPhoneNumber());
+       }
+
+       @Override
+       public void copyUserToController () {
+               // Log message
+               //* NOISY-DEBUG: */ System.out.println("AdminHelper::copyUserToController - CALLED!"); //NOI18N
+
+               // Validate user instance
+               if (this.getUser() == null) {
+                       // Throw NPE
+                       throw new NullPointerException("this.user is null"); //NOI18N
+               } else if (this.getUser().getUserId() == null) {
+                       // Throw NPE again
+                       throw new NullPointerException("this.user.userId is null"); //NOI18N
+               } else if (this.getUser().getUserId() < 1) {
+                       // Not valid
+                       throw new IllegalStateException(MessageFormat.format("this.user.userId={0} is not valid.", this.getUser().getUserId())); //NOI18N
+               }
+
+               // Get contact
+               Contact userContact = this.getUser().getUserContact();
+
+               // Set contact here, too. This avoids parameters that cannot auto-complete in IDEs.
+               this.setContact(userContact);
+
+               // Set all phone instances
+               this.setPhoneInstances(userContact);
+
+               // Set all fields: user
+               this.userController.setUserName(this.getUser().getUserName());
+               this.adminUserController.setUserName(this.getUser().getUserName());
+       }
+
+       @Override
+       public Contact getContact () {
+               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               // System.out.println(MessageFormat.format("{0}: Returning this.contact={1}, caller: {2}", this.getClass().getSimpleName(), this.contact, caller));
+               return this.contact;
+       }
+
+       @Override
+       public void setContact (final Contact contact) {
+               // String caller = MessageFormat.format("{0}.{1}", Thread.currentThread().getStackTrace()[THREAD_STACK].getClassName(), Thread.currentThread().getStackTrace()[THREAD_STACK].getMethodName());
+               // System.out.println(MessageFormat.format("{0}: Setting contact={1}, previous: {2}, caller: {3}", this.getClass().getSimpleName(), contact, this.contact, caller));
+               this.contact = contact;
+       }
+
+       @Override
+       public String getContactUsageMessageKey (final Contact contact) {
+               // The contact must be valid
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw again ...
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               }
+
+               // Default key is "unused"
+               String messageKey = "CONTACT_IS_UNUSED"; //NOI18N
+
+               // Check user contact
+               boolean isUserContact = this.userController.isContactFound(contact);
+
+               // Check user first
+               if (isUserContact) {
+                       // Only user
+                       messageKey = "CONTACT_IS_USER"; //NOI18N
+               }
+
+               // Return message key
+               return messageKey;
+       }
+
+       @Override
+       public DialableFaxNumber getFaxNumber () {
+               return this.faxNumber;
+       }
+
+       @Override
+       public void setFaxNumber (final DialableFaxNumber faxNumber) {
+               this.faxNumber = faxNumber;
+       }
+
+       @Override
+       public DialableLandLineNumber getLandLineNumber () {
+               return this.landLineNumber;
+       }
+
+       @Override
+       public void setLandLineNumber (final DialableLandLineNumber landLineNumber) {
+               this.landLineNumber = landLineNumber;
+       }
+
+       @Override
+       public DialableMobileNumber getMobileNumber () {
+               return this.mobileNumber;
+       }
+
+       @Override
+       public void setMobileNumber (final DialableMobileNumber mobileNumber) {
+               this.mobileNumber = mobileNumber;
+       }
+
+       @Override
+       public User getUser () {
+               return this.user;
+       }
+
+       @Override
+       public void setUser (final User user) {
+               this.user = user;
+       }
+
+       /**
+        * Set's all given contact's phone instances: land-line, mobile and
+        * faxNumber
+        * <p>
+        * @param contact Contact to set phone instances for
+        */
+       private void setPhoneInstances (final Contact contact) {
+               // The contact must be valid
+               if (null == contact) {
+                       // Throw NPE
+                       throw new NullPointerException("contact is null"); //NOI18N
+               } else if (contact.getContactId() == null) {
+                       // Throw again ...
+                       throw new NullPointerException("contact.contactId is null"); //NOI18N
+               } else if (contact.getContactId() < 1) {
+                       // Not valid
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N
+               }
+
+               // Is mobile set?
+               if (contact.getContactMobileNumber() instanceof DialableMobileNumber) {
+                       // Yes, then set it in admin controller
+                       this.setMobileNumber(contact.getContactMobileNumber());
+               }
+
+               // Is land-line set?
+               if (contact.getContactLandLineNumber() instanceof DialableLandLineNumber) {
+                       // Yes, then set it in admin controller
+                       this.setLandLineNumber(contact.getContactLandLineNumber());
+               }
+
+               // Is faxNumber set?
+               if (contact.getContactFaxNumber() instanceof DialableFaxNumber) {
+                       // Yes, then set it in admin controller
+                       this.setFaxNumber(contact.getContactFaxNumber());
+               }
+       }
+
+}
index 9b46b8c30a08e9dd67ed0c6def72b513b5084dca..6929311d6cb1728c86fa49d669ff3131f1eb200b 100644 (file)
@@ -804,7 +804,7 @@ public class FinancialsUserWebSessionBean extends BaseFinancialsController imple
        @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
index 802b66a08af134f6d44ec406d968ef336224057d..f334381c8673f8957333956b0357d8d7ba432883 100644 (file)
@@ -124,7 +124,7 @@ public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
                } 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 FinancialsUserRegisterWebSessionBean extends BaseFinancialsControll
                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
index cf7f56f65346e1b89fbbc82f3cdc6b79bc63b11c..fca11c6cc190fba43e5e392a7b00663de7143a27 100644 (file)
-/*\r
- * Copyright (C) 2017 Roland Häder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU Affero General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Affero General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jfinancials.converter.fax;\r
-\r
-import java.text.MessageFormat;\r
-import javax.faces.component.UIComponent;\r
-import javax.faces.context.FacesContext;\r
-import javax.faces.convert.Converter;\r
-import javax.faces.convert.ConverterException;\r
-import javax.faces.convert.FacesConverter;\r
-import javax.naming.Context;\r
-import javax.naming.InitialContext;\r
-import javax.naming.NamingException;\r
-import org.mxchange.jcoreeelogger.beans.local.logger.Log;\r
-import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;\r
-import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;\r
-import org.mxchange.jphone.phonenumbers.DialableNumber;\r
-import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;\r
-import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;\r
-\r
-/**\r
- * Converter for fax id <-> valid fax number instance\r
- * <p>\r
- * @author Roland Häder<roland@mxchange.org>\r
- */\r
-@FacesConverter (value = "FaxNumberConverter")\r
-public class FinancialsFaxNumberConverter implements Converter {\r
-\r
-       /**\r
-        * Logger instance\r
-        */\r
-       @Log\r
-       private LoggerBeanLocal loggerBeanLocal;\r
-\r
-       /**\r
-        * Phone EJB\r
-        */\r
-       private PhoneSessionBeanRemote phoneBean;\r
-\r
-       /**\r
-        * Initialization of this converter\r
-        */\r
-       public FinancialsFaxNumberConverter () {\r
-               // Try to get it\r
-               try {\r
-                       // Get initial context\r
-                       Context context = new InitialContext();\r
-\r
-                       // Lookup logger\r
-                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N\r
-\r
-                       // ... and user controller\r
-                       this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N\r
-               } catch (final NamingException ex) {\r
-                       // Continue to throw it\r
-                       throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {\r
-               // Log message\r
-               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N\r
-\r
-               // Is the value null or empty?\r
-               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {\r
-                       // Warning message\r
-                       this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N\r
-\r
-                       // Return null\r
-                       return null;\r
-               }\r
-\r
-               // Init instance\r
-               DialableFaxNumber faxNumber = null;\r
-\r
-               try {\r
-                       // Try to parse the value as long\r
-                       Long faxNumberId = Long.valueOf(submittedValue);\r
-\r
-                       // Log message\r
-                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject: faxNumberId={1}", this.getClass().getSimpleName(), faxNumberId)); //NOI18N\r
-\r
-                       // Try to get mobile instance from it\r
-                       faxNumber = this.phoneBean.findFaxNumberById(faxNumberId);\r
-               } catch (final NumberFormatException ex) {\r
-                       // Throw again\r
-                       throw new ConverterException(ex);\r
-               } catch (final PhoneEntityNotFoundException ex) {\r
-                       // Debug message\r
-                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N\r
-               }\r
-\r
-               // Log message\r
-               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: faxNumber={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N\r
-\r
-               // Return it\r
-               return faxNumber;\r
-       }\r
-\r
-       @Override\r
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {\r
-               // Is the object null?\r
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {\r
-                       // Is null\r
-                       return ""; //NOI18N\r
-               } else if (!(value instanceof DialableNumber)) {\r
-                       // Not same interface\r
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N\r
-               }\r
-\r
-               // Return category id\r
-               return String.valueOf(((DialableNumber) value).getPhoneId());\r
-       }\r
-\r
-}\r
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.converter.fax;
+
+import java.text.MessageFormat;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.convert.FacesConverter;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jcoreeelogger.beans.local.logger.Log;
+import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
+import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
+import org.mxchange.jphone.phonenumbers.DialableNumber;
+import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
+import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
+
+/**
+ * Converter for fax id <-> valid fax number instance
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesConverter (value = "FaxNumberConverter")
+public class FinancialsFaxNumberConverter implements Converter {
+
+       /**
+        * Logger instance
+        */
+       @Log
+       private LoggerBeanLocal loggerBeanLocal;
+
+       /**
+        * Phone EJB
+        */
+       private PhoneSessionBeanRemote phoneBean;
+
+       /**
+        * Initialization of this converter
+        */
+       public FinancialsFaxNumberConverter () {
+               // Try to get it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Lookup logger
+                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
+
+                       // ... and user controller
+                       this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N
+               } catch (final NamingException ex) {
+                       // Continue to throw it
+                       throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
+               }
+       }
+
+       @Override
+       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+               // Log message
+               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N
+
+               // Is the value null or empty?
+               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
+                       // Warning message
+                       this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N
+
+                       // Return null
+                       return null;
+               }
+
+               // Init instance
+               DialableFaxNumber faxNumber = null;
+
+               try {
+                       // Try to parse the value as long
+                       Long faxNumberId = Long.valueOf(submittedValue);
+
+                       // Log message
+                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject: faxNumberId={1}", this.getClass().getSimpleName(), faxNumberId)); //NOI18N
+
+                       // Try to get mobile instance from it
+                       faxNumber = this.phoneBean.findFaxNumberById(faxNumberId);
+               } catch (final NumberFormatException ex) {
+                       // Throw again
+                       throw new ConverterException(ex);
+               } catch (final PhoneEntityNotFoundException ex) {
+                       // Debug message
+                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
+               }
+
+               // Log message
+               this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: faxNumber={1} - EXIT!", this.getClass().getSimpleName(), faxNumber)); //NOI18N
+
+               // Return it
+               return faxNumber;
+       }
+
+       @Override
+       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+               // Is the object null?
+               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+                       // Is null
+                       return ""; //NOI18N
+               } else if (!(value instanceof DialableNumber)) {
+                       // Not same interface
+                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+               }
+
+               // Return category id
+               return String.valueOf(((DialableNumber) value).getPhoneId());
+       }
+
+}
index 8f8f9f65fba427dfdc3ebbdd69b5c82a3447b273..c81c4fb886a7f62945fd9778cdad0f04ce2db78e 100644 (file)
-/*\r
- * Copyright (C) 2017 Roland Häder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU Affero General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Affero General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jfinancials.converter.landline;\r
-\r
-import java.text.MessageFormat;\r
-import javax.faces.component.UIComponent;\r
-import javax.faces.context.FacesContext;\r
-import javax.faces.convert.Converter;\r
-import javax.faces.convert.ConverterException;\r
-import javax.faces.convert.FacesConverter;\r
-import javax.naming.Context;\r
-import javax.naming.InitialContext;\r
-import javax.naming.NamingException;\r
-import org.mxchange.jcoreeelogger.beans.local.logger.Log;\r
-import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;\r
-import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;\r
-import org.mxchange.jphone.phonenumbers.DialableNumber;\r
-import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;\r
-import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;\r
-\r
-/**\r
- * Converter for land-line id <-> valid land-line number instance\r
- * <p>\r
- * @author Roland Häder<roland@mxchange.org>\r
- */\r
-@FacesConverter (value = "LandLineNumberConverter")\r
-public class FinancialsLandLineNumberConverter implements Converter {\r
-\r
-       /**\r
-        * Logger instance\r
-        */\r
-       @Log\r
-       private LoggerBeanLocal loggerBeanLocal;\r
-\r
-       /**\r
-        * Phone EJB\r
-        */\r
-       private PhoneSessionBeanRemote phoneBean;\r
-\r
-       /**\r
-        * Initialization of this converter\r
-        */\r
-       public FinancialsLandLineNumberConverter () {\r
-               // Try to get it\r
-               try {\r
-                       // Get initial context\r
-                       Context context = new InitialContext();\r
-\r
-                       // Lookup logger\r
-                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N\r
-\r
-                       // ... and user controller\r
-                       this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N\r
-               } catch (final NamingException ex) {\r
-                       // Continue to throw it\r
-                       throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N\r
-               }\r
-       }\r
-\r
-       @Override\r
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {\r
-               // Is the value null or empty?\r
-               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {\r
-                       // Warning message\r
-                       this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N\r
-\r
-                       // Return null\r
-                       return null;\r
-               }\r
-\r
-               // Init instance\r
-               DialableLandLineNumber landLineNumber = null;\r
-\r
-               try {\r
-                       // Try to parse the value as long\r
-                       Long landLineNumberId = Long.valueOf(submittedValue);\r
-\r
-                       // Try to get mobile instance from it\r
-                       landLineNumber = this.phoneBean.findLandLineNumberById(landLineNumberId);\r
-               } catch (final NumberFormatException ex) {\r
-                       // Throw again\r
-                       throw new ConverterException(ex);\r
-               } catch (final PhoneEntityNotFoundException ex) {\r
-                       // Debug message\r
-                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N\r
-               }\r
-\r
-               // Return it\r
-               return landLineNumber;\r
-       }\r
-\r
-       @Override\r
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {\r
-               // Is the object null?\r
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {\r
-                       // Is null\r
-                       return ""; //NOI18N\r
-               } else if (!(value instanceof DialableNumber)) {\r
-                       // Not same interface\r
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N\r
-               }\r
-\r
-               // Return category id\r
-               return String.valueOf(((DialableNumber) value).getPhoneId());\r
-       }\r
-\r
-}\r
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.converter.landline;
+
+import java.text.MessageFormat;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.convert.FacesConverter;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jcoreeelogger.beans.local.logger.Log;
+import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
+import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
+import org.mxchange.jphone.phonenumbers.DialableNumber;
+import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
+import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
+
+/**
+ * Converter for land-line id <-> valid land-line number instance
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesConverter (value = "LandLineNumberConverter")
+public class FinancialsLandLineNumberConverter implements Converter {
+
+       /**
+        * Logger instance
+        */
+       @Log
+       private LoggerBeanLocal loggerBeanLocal;
+
+       /**
+        * Phone EJB
+        */
+       private PhoneSessionBeanRemote phoneBean;
+
+       /**
+        * Initialization of this converter
+        */
+       public FinancialsLandLineNumberConverter () {
+               // Try to get it
+               try {
+                       // Get initial context
+                       Context context = new InitialContext();
+
+                       // Lookup logger
+                       this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
+
+                       // ... and user controller
+                       this.phoneBean = (PhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N
+               } catch (final NamingException ex) {
+                       // Continue to throw it
+                       throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
+               }
+       }
+
+       @Override
+       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+               // Is the value null or empty?
+               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
+                       // Warning message
+                       this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N
+
+                       // Return null
+                       return null;
+               }
+
+               // Init instance
+               DialableLandLineNumber landLineNumber = null;
+
+               try {
+                       // Try to parse the value as long
+                       Long landLineNumberId = Long.valueOf(submittedValue);
+
+                       // Try to get mobile instance from it
+                       landLineNumber = this.phoneBean.findLandLineNumberById(landLineNumberId);
+               } catch (final NumberFormatException ex) {
+                       // Throw again
+                       throw new ConverterException(ex);
+               } catch (final PhoneEntityNotFoundException ex) {
+                       // Debug message
+                       this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
+               }
+
+               // Return it
+               return landLineNumber;
+       }
+
+       @Override
+       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+               // Is the object null?
+               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+                       // Is null
+                       return ""; //NOI18N
+               } else if (!(value instanceof DialableNumber)) {
+                       // Not same interface
+                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+               }
+
+               // Return category id
+               return String.valueOf(((DialableNumber) value).getPhoneId());
+       }
+
+}
index f908ca921f556e57eae3cf69e38578f626755abd..c2fd838bbcb28bee55cb85d0d661422141eff81e 100644 (file)
-/*\r
- * Copyright (C) 2016, 2017 Roland Häder\r
- *\r
- * This program is free software: you can redistribute it and/or modify\r
- * it under the terms of the GNU Affero General Public License as\r
- * published by the Free Software Foundation, either version 3 of the\r
- * License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU Affero General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU Affero General Public License\r
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
- */\r
-package org.mxchange.jfinancials.converter.mobile;\r
-\r
-import java.text.MessageFormat;\r
-import javax.faces.component.UIComponent;\r
-import javax.faces.context.FacesContext;\r
-import javax.faces.convert.Converter;\r
-import javax.faces.convert.ConverterException;\r
-import javax.faces.convert.FacesConverter;\r
-import javax.naming.Context;\r
-import javax.naming.InitialContext;\r
-import javax.naming.NamingException;\r
-import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;\r
-import org.mxchange.jphone.phonenumbers.DialableNumber;\r
-import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;\r
-import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;\r
-\r
-/**\r
- * Converter for mobile id <-> valid mobile instance\r
- * <p>\r
- * @author Roland Häder<roland@mxchange.org>\r
- */\r
-@FacesConverter (value = "MobileNumberConverter")\r
-public class FinancialsMobileNumberConverter implements Converter {\r
-\r
-       /**\r
-        * Phone EJB\r
-        */\r
-       private PhoneSessionBeanRemote phoneBean;\r
-\r
-       /**\r
-        * Initialization of this converter\r
-        */\r
-       public FinancialsMobileNumberConverter () {\r
-       }\r
-\r
-       @Override\r
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {\r
-               // Is the value null or empty?\r
-               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {\r
-                       // Warning message\r
-                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N\r
-\r
-                       // Return null\r
-                       return null;\r
-               }\r
-\r
-               synchronized (this) {\r
-                       // Is the EJB instanciated?\r
-                       if (null == this.phoneBean) {\r
-                               // Try to get it\r
-                               try {\r
-                                       // Get initial context\r
-                                       Context initialContext = new InitialContext();\r
-\r
-                                       // ... and user controller\r
-                                       this.phoneBean = (PhoneSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N\r
-                               } catch (final NamingException ex) {\r
-                                       // Continue to throw it\r
-                                       throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N\r
-                               }\r
-                       }\r
-               }\r
-\r
-               // Init instance\r
-               DialableMobileNumber mobile = null;\r
-\r
-               try {\r
-                       // Try to parse the value as long\r
-                       Long mobileId = Long.valueOf(submittedValue);\r
-\r
-                       // Try to get mobile instance from it\r
-                       mobile = this.phoneBean.findMobileNumberById(mobileId);\r
-               } catch (final NumberFormatException ex) {\r
-                       // Throw again\r
-                       throw new ConverterException(ex);\r
-               } catch (final PhoneEntityNotFoundException ex) {\r
-                       // Debug message\r
-                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N\r
-               }\r
-\r
-               // Return it\r
-               return mobile;\r
-       }\r
-\r
-       @Override\r
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {\r
-               // Is the object null?\r
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {\r
-                       // Is null\r
-                       return ""; //NOI18N\r
-               } else if (!(value instanceof DialableNumber)) {\r
-                       // Not same interface\r
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N\r
-               }\r
-\r
-               // Return category id\r
-               return String.valueOf(((DialableNumber) value).getPhoneId());\r
-       }\r
-\r
-}\r
+/*
+ * Copyright (C) 2016, 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.converter.mobile;
+
+import java.text.MessageFormat;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.faces.convert.FacesConverter;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
+import org.mxchange.jphone.phonenumbers.DialableNumber;
+import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
+import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
+
+/**
+ * Converter for mobile id <-> valid mobile instance
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesConverter (value = "MobileNumberConverter")
+public class FinancialsMobileNumberConverter implements Converter {
+
+       /**
+        * Phone EJB
+        */
+       private PhoneSessionBeanRemote phoneBean;
+
+       /**
+        * Initialization of this converter
+        */
+       public FinancialsMobileNumberConverter () {
+       }
+
+       @Override
+       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+               // Is the value null or empty?
+               if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
+                       // Warning message
+                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N
+
+                       // Return null
+                       return null;
+               }
+
+               synchronized (this) {
+                       // Is the EJB instanciated?
+                       if (null == this.phoneBean) {
+                               // Try to get it
+                               try {
+                                       // Get initial context
+                                       Context initialContext = new InitialContext();
+
+                                       // ... and user controller
+                                       this.phoneBean = (PhoneSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N
+                               } catch (final NamingException ex) {
+                                       // Continue to throw it
+                                       throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
+                               }
+                       }
+               }
+
+               // Init instance
+               DialableMobileNumber mobile = null;
+
+               try {
+                       // Try to parse the value as long
+                       Long mobileId = Long.valueOf(submittedValue);
+
+                       // Try to get mobile instance from it
+                       mobile = this.phoneBean.findMobileNumberById(mobileId);
+               } catch (final NumberFormatException ex) {
+                       // Throw again
+                       throw new ConverterException(ex);
+               } catch (final PhoneEntityNotFoundException ex) {
+                       // Debug message
+                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
+               }
+
+               // Return it
+               return mobile;
+       }
+
+       @Override
+       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+               // Is the object null?
+               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+                       // Is null
+                       return ""; //NOI18N
+               } else if (!(value instanceof DialableNumber)) {
+                       // Not same interface
+                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement DialableNumber.", value)); //NOI18N
+               }
+
+               // Return category id
+               return String.valueOf(((DialableNumber) value).getPhoneId());
+       }
+
+}
index 52f1cc58c144b30568f037bfe224047f3523953c..53c83f28917cc8de0982312312b7a8df65e578e1 100644 (file)
@@ -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}" />
 
index 42e57557ec531fc499d1f7e40be2111dbd22db41..c3a137cd139957b42eeef68ea9a124b91a39aac9 100644 (file)
@@ -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}" />
 
index 1bc058f8a534ab161d6d9259133583958a2ed1e6..778b49465c208c8eefd7b0585ad65bcfbaa9d037 100644 (file)
@@ -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>
index cc8edcf362cfce6df68ade8afcf3ee9469306079..74f86eebebdfc7913d991cc16fdb2bde121dd397 100644 (file)
@@ -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>
index 97af2dbae5cbca485903cd8adef778ff7b946322..e7f92540957f4a8cc9a590dcbcdf7b39e0733675 100644 (file)
@@ -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">
index 7fb7d9c8e3a0f8b076d3fda56699957a6458202f..98f822df618c26f914d3a7d90b9a6866428685ff 100644 (file)
@@ -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">
index 54da423aa101950750ea62e8a4b8d10a1aa71d8a..1d420288a0c176174258eb691b629d087d7a17b1 100644 (file)
@@ -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>
         <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>
index 9e714dc029b4e373017493041d6787f737c66c92..9d7ca70db7c3eb86469472f564f90e427371d831 100644 (file)
@@ -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}" />
index 407caadadd478f95e6cef091083b2a731691142e..b44a9eee4e77ce670fab58d3eabbabb80092498d 100644 (file)
@@ -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}" />
index 546c88281f77ea72bcc12b45fb3d6432911774f4..23890a9ae54138dd4a7d3bb6fc7379ac50d3b983 100644 (file)
@@ -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}" />
index 94ea425cbce2df9bd064da28d312a45ff773fd36..8cae955a5236c31adfff11a462e067dd3842dd0b 100644 (file)
@@ -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}" />
 
                                        <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" />
index fd429a4532e8b9b884b3dcb632ce5baca21a918d..b4a54a36e9c8faa88fc8ac3eb205ff3423c561ca 100644 (file)
@@ -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" />
index 7d238fb582e1bb6d8a493acd4a0c9de7972e8372..8bed557c53c1300018d16ebf85f3f0b7ecf31af2 100644 (file)
@@ -19,7 +19,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;" />
index fe89f8761095424e4739c76878fb3a126eb887f0..7e180037b408896f108300254f64ea267d442e7c 100644 (file)
@@ -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}" />