From db61e18eec211dfdcf839cc6f1aa3e609b0d8e38 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 13 Apr 2017 14:58:21 +0200 Subject: [PATCH] renamed namespace to jfinancials (Java naming-convention) + renamed *Addressbook* to *Financials* to not have confusions in IDEs like Netbeans MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...ressbook-core.jar => jfinancials-core.jar} | Bin 17751 -> 17746 bytes lib/jfinancials-lib.jar | Bin 0 -> 1571 bytes nbproject/faces-config.NavData | 16 +- nbproject/genfiles.properties | 4 +- nbproject/project.properties | 2 +- .../AddressbookWebSessionBean.java | 465 ------------------ .../AddressbookWebSessionController.java | 218 -------- .../AddressbookSharesWebSessionBean.java | 345 ------------- ...AddressbookSharesWebSessionController.java | 122 ----- .../addressbook/AddressbookIdValidator.java | 120 ----- .../names/AddressbookNameValidator.java | 53 -- .../beans/BaseFinancialsController.java} | 4 +- ...ncialsConfirmationLinkWebRequestBean.java} | 18 +- ...ConfirmationLinkWebRequestController.java} | 4 +- ...FinancialsAdminContactWebRequestBean.java} | 16 +- ...ialsAdminContactWebRequestController.java} | 4 +- .../FinancialsContactWebSessionBean.java} | 18 +- ...inancialsContactWebSessionController.java} | 4 +- ...FinancialsContactPhoneWebSessionBean.java} | 18 +- ...ialsContactPhoneWebSessionController.java} | 6 +- ...FinancialsAdminCountryWebRequestBean.java} | 12 +- ...ialsAdminCountryWebRequestController.java} | 4 +- .../FinancialsCountryWebApplicationBean.java} | 10 +- ...cialsCountryWebApplicationController.java} | 4 +- .../FinancialsEmailChangeWebSessionBean.java} | 18 +- ...cialsEmailChangeWebSessionController.java} | 4 +- .../FinancialsFeatureWebApplicationBean.java} | 6 +- ...ialsFeaturesWebApplicationController.java} | 4 +- .../FinancialsGenderWebApplicationBean.java} | 8 +- ...ncialsGenderWebApplicationController.java} | 4 +- .../FinancialsWebRequestController.java} | 4 +- .../helper/FinancialsWebRequestHelper.java} | 22 +- .../FinancialsLocalizationSessionBean.java} | 24 +- ...ancialsLocalizationSessionController.java} | 4 +- .../FinancialsUserLoginWebSessionBean.java} | 16 +- ...ancialsUserLoginWebSessionController.java} | 4 +- ...alsAdminMobileProviderWebRequestBean.java} | 12 +- ...inMobileProviderWebRequestController.java} | 4 +- ...nancialsMobileProviderWebRequestBean.java} | 10 +- ...lsMobileProviderWebRequestController.java} | 4 +- .../FinancialsAdminPhoneWebRequestBean.java} | 10 +- ...ncialsAdminPhoneWebRequestController.java} | 12 +- .../FinancialsUserProfileWebRequestBean.java} | 14 +- ...cialsUserProfileWebRequestController.java} | 4 +- ...ancialsProfileModeWebApplicationBean.java} | 8 +- ...sProfileModeWebApplicationController.java} | 4 +- ...FinancialsUserRegisterWebSessionBean.java} | 26 +- ...ialsUserRegisterWebSessionController.java} | 4 +- .../FinancialsResendLinkWebSessionBean.java} | 18 +- ...ncialsResendLinkWebSessionController.java} | 4 +- .../FinancialsAdminUserWebRequestBean.java} | 30 +- ...ancialsAdminUserWebRequestController.java} | 4 +- .../user/FinancialsUserWebSessionBean.java} | 30 +- .../FinancialsUserWebSessionController.java} | 4 +- ...FinancialsUserPasswordWebRequestBean.java} | 18 +- ...ialsUserPasswordWebRequestController.java} | 4 +- .../contact/AddressbookContactConverter.java | 4 +- .../country/AddressbookCountryConverter.java | 4 +- .../mobile/FinancialsMobileConverter.java} | 26 +- .../FinancialsMobileProviderConverter.java} | 8 +- .../user/FinancialsUserConverter.java} | 8 +- .../FinancialsBirthdayValidator.java} | 6 +- .../FinancialsEmailAddressValidator.java} | 8 +- .../FinancialsUserPasswordValidator.java} | 8 +- .../user/FinancialsUserIdValidator.java} | 14 +- .../localization/bundle_de_DE.properties | 60 +-- .../localization/bundle_en_US.properties | 80 +-- web/WEB-INF/faces-config.xml | 64 +-- .../admin/cellphone/admin_cellphone_data.tpl | 46 -- .../admin/contact/admin_form_contact_data.tpl | 2 +- .../admin_form_contact_mobile.tpl} | 2 +- .../admin_mobile_add_show.tpl} | 4 +- .../admin/mobile/admin_mobile_data.tpl | 46 ++ .../admin_mobile_links.tpl} | 8 +- .../templates/contact/form_contact_data.tpl | 2 +- .../generic/mobile_selection_box.tpl | 6 +- .../templates/login/user/user_menu.tpl | 18 - web/admin/contact/admin_contact_show.xhtml | 2 +- .../admin_cellphone_delete.xhtml | 0 .../admin_cellphone_edit.xhtml | 0 .../admin_cellphone_show.xhtml | 6 +- .../admin_contact_cellphone_list.xhtml | 2 +- .../admin_contact_cellphone_unlink.xhtml | 0 web/admin/user/admin_user_show.xhtml | 2 +- web/guest/user/show_addressbook.xhtml | 56 --- web/guest/user/show_addressbook_entries.xhtml | 22 - web/guest/user/user_list.xhtml | 12 - web/user/login_add_addressbook.xhtml | 51 -- .../login_list_sharing_addressbooks.xhtml | 41 -- web/user/login_other_addressbooks.xhtml | 28 -- web/user/login_own_addressbooks.xhtml | 67 --- web/user/login_shared_addressbooks.xhtml | 66 --- .../login_start_sharing_addressbook.xhtml | 70 --- 93 files changed, 396 insertions(+), 2262 deletions(-) rename lib/{addressbook-core.jar => jfinancials-core.jar} (56%) create mode 100644 lib/jfinancials-lib.jar delete mode 100644 src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java delete mode 100644 src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java delete mode 100644 src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java delete mode 100644 src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java delete mode 100644 src/java/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java delete mode 100644 src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java rename src/java/org/mxchange/{addressbook/beans/BaseAddressbookController.java => jfinancials/beans/BaseFinancialsController.java} (97%) rename src/java/org/mxchange/{addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java => jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java} (89%) rename src/java/org/mxchange/{addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestController.java => jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java => jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java} (97%) rename src/java/org/mxchange/{addressbook/beans/contact/AddressbookAdminContactWebRequestController.java => jfinancials/beans/contact/FinancialsAdminContactWebRequestController.java} (98%) rename src/java/org/mxchange/{addressbook/beans/contact/AddressbookContactWebSessionBean.java => jfinancials/beans/contact/FinancialsContactWebSessionBean.java} (98%) rename src/java/org/mxchange/{addressbook/beans/contact/AddressbookContactWebSessionController.java => jfinancials/beans/contact/FinancialsContactWebSessionController.java} (98%) rename src/java/org/mxchange/{addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java => jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java} (89%) rename src/java/org/mxchange/{addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java => jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java => jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java} (93%) rename src/java/org/mxchange/{addressbook/beans/country/AddressbookAdminCountryWebRequestController.java => jfinancials/beans/country/FinancialsAdminCountryWebRequestController.java} (95%) rename src/java/org/mxchange/{addressbook/beans/country/AddressbookCountryWebApplicationBean.java => jfinancials/beans/country/FinancialsCountryWebApplicationBean.java} (89%) rename src/java/org/mxchange/{addressbook/beans/country/AddressbookCountryWebApplicationController.java => jfinancials/beans/country/FinancialsCountryWebApplicationController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java => jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java} (91%) rename src/java/org/mxchange/{addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java => jfinancials/beans/email_address/FinancialsEmailChangeWebSessionController.java} (92%) rename src/java/org/mxchange/{addressbook/beans/features/AddressbookFeatureWebApplicationBean.java => jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java} (87%) rename src/java/org/mxchange/{addressbook/beans/features/AddressbookFeaturesWebApplicationController.java => jfinancials/beans/features/FinancialsFeaturesWebApplicationController.java} (88%) rename src/java/org/mxchange/{addressbook/beans/gender/AddressbookGenderWebApplicationBean.java => jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java} (82%) rename src/java/org/mxchange/{addressbook/beans/gender/AddressbookGenderWebApplicationController.java => jfinancials/beans/gender/FinancialsGenderWebApplicationController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/helper/AddressbookWebRequestController.java => jfinancials/beans/helper/FinancialsWebRequestController.java} (94%) rename src/java/org/mxchange/{addressbook/beans/helper/AddressbookWebRequestHelper.java => jfinancials/beans/helper/FinancialsWebRequestHelper.java} (89%) rename src/java/org/mxchange/{addressbook/beans/localization/AddressbookLocalizationSessionBean.java => jfinancials/beans/localization/FinancialsLocalizationSessionBean.java} (78%) rename src/java/org/mxchange/{addressbook/beans/localization/AddressbookLocalizationSessionController.java => jfinancials/beans/localization/FinancialsLocalizationSessionController.java} (93%) rename src/java/org/mxchange/{addressbook/beans/login/AddressbookUserLoginWebSessionBean.java => jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java} (95%) rename src/java/org/mxchange/{addressbook/beans/login/AddressbookUserLoginWebSessionController.java => jfinancials/beans/login/FinancialsUserLoginWebSessionController.java} (96%) rename src/java/org/mxchange/{addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java => jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java} (92%) rename src/java/org/mxchange/{addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestController.java => jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestController.java} (94%) rename src/java/org/mxchange/{addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java => jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java} (90%) rename src/java/org/mxchange/{addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestController.java => jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestController.java} (91%) rename src/java/org/mxchange/{addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java => jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java} (88%) rename src/java/org/mxchange/{addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java => jfinancials/beans/phone/FinancialsAdminPhoneWebRequestController.java} (85%) rename src/java/org/mxchange/{addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java => jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java} (85%) rename src/java/org/mxchange/{addressbook/beans/profile/AddressbookUserProfileWebRequestController.java => jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java => jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java} (79%) rename src/java/org/mxchange/{addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java => jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java} (88%) rename src/java/org/mxchange/{addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java => jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java} (88%) rename src/java/org/mxchange/{addressbook/beans/register/AddressbookUserRegisterWebSessionController.java => jfinancials/beans/register/FinancialsUserRegisterWebSessionController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/resendlink/AddressbookResendLinkWebSessionBean.java => jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java} (85%) rename src/java/org/mxchange/{addressbook/beans/resendlink/AddressbookResendLinkWebSessionController.java => jfinancials/beans/resendlink/FinancialsResendLinkWebSessionController.java} (90%) rename src/java/org/mxchange/{addressbook/beans/user/AddressbookAdminUserWebRequestBean.java => jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java} (93%) rename src/java/org/mxchange/{addressbook/beans/user/AddressbookAdminUserWebRequestController.java => jfinancials/beans/user/FinancialsAdminUserWebRequestController.java} (96%) rename src/java/org/mxchange/{addressbook/beans/user/AddressbookUserWebSessionBean.java => jfinancials/beans/user/FinancialsUserWebSessionBean.java} (96%) rename src/java/org/mxchange/{addressbook/beans/user/AddressbookUserWebSessionController.java => jfinancials/beans/user/FinancialsUserWebSessionController.java} (98%) rename src/java/org/mxchange/{addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java => jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java} (91%) rename src/java/org/mxchange/{addressbook/beans/user/password/AddressbookUserPasswordWebRequestController.java => jfinancials/beans/user/password/FinancialsUserPasswordWebRequestController.java} (93%) rename src/java/org/mxchange/{addressbook => jfinancials}/converter/contact/AddressbookContactConverter.java (97%) rename src/java/org/mxchange/{addressbook => jfinancials}/converter/country/AddressbookCountryConverter.java (97%) rename src/java/org/mxchange/{addressbook/converter/cellphone/AddressbookCellphoneConverter.java => jfinancials/converter/mobile/FinancialsMobileConverter.java} (86%) rename src/java/org/mxchange/{addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java => jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java} (95%) rename src/java/org/mxchange/{addressbook/converter/user/AddressbookUserConverter.java => jfinancials/converter/user/FinancialsUserConverter.java} (95%) rename src/java/org/mxchange/{addressbook/validator/birthday/AddressbookBirthdayValidator.java => jfinancials/validator/birthday/FinancialsBirthdayValidator.java} (93%) rename src/java/org/mxchange/{addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java => jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java} (94%) rename src/java/org/mxchange/{addressbook/validator/password/AddressbookUserPasswordValidator.java => jfinancials/validator/password/FinancialsUserPasswordValidator.java} (89%) rename src/java/org/mxchange/{addressbook/validator/user/AddressbookUserIdValidator.java => jfinancials/validator/user/FinancialsUserIdValidator.java} (92%) delete mode 100644 web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl rename web/WEB-INF/templates/admin/{cellphone/admin_form_contact_cellphone.tpl => mobile/admin_form_contact_mobile.tpl} (90%) rename web/WEB-INF/templates/admin/{cellphone/admin_cellphone_add_show.tpl => mobile/admin_mobile_add_show.tpl} (78%) create mode 100644 web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl rename web/WEB-INF/templates/admin/{cellphone/admin_cellphone_links.tpl => mobile/admin_mobile_links.tpl} (90%) rename web/admin/{cellphone => mobile}/admin_cellphone_delete.xhtml (100%) rename web/admin/{cellphone => mobile}/admin_cellphone_edit.xhtml (100%) rename web/admin/{cellphone => mobile}/admin_cellphone_show.xhtml (90%) rename web/admin/{cellphone => mobile}/admin_contact_cellphone_list.xhtml (76%) rename web/admin/{cellphone => mobile}/admin_contact_cellphone_unlink.xhtml (100%) delete mode 100644 web/guest/user/show_addressbook.xhtml delete mode 100644 web/guest/user/show_addressbook_entries.xhtml delete mode 100644 web/user/login_add_addressbook.xhtml delete mode 100644 web/user/login_list_sharing_addressbooks.xhtml delete mode 100644 web/user/login_other_addressbooks.xhtml delete mode 100644 web/user/login_own_addressbooks.xhtml delete mode 100644 web/user/login_shared_addressbooks.xhtml delete mode 100644 web/user/login_start_sharing_addressbook.xhtml diff --git a/lib/addressbook-core.jar b/lib/jfinancials-core.jar similarity index 56% rename from lib/addressbook-core.jar rename to lib/jfinancials-core.jar index 36c8f87e76366fe7597f8c5dc14348a9ec148b72..c7773edc2a81dbdebecf87f08f92fed6ce6d0b32 100644 GIT binary patch delta 545 zcmccK#dxWUkte{LnT3mifrEiTsbV6JCX-^tMDs;VG8GeVD}czqnm}^02BW-0R$69W zVqS7)VotF>LK9Fjo>9IYSu!QDBrz$mI2A=zuh))M4IL4V3=AOb#K6FiUzDz&TalcR zn3tZak5#`D&=5Dcr7loool+C?^pbNDi;GYF+qDm9kTH|W=6{UpEJk)dq?)-og6%v9 zzdWi%lg;_9xse<+xt8AnnZNl2zlxxt4as)NDcUMADOF64b+!bC^5hxL4xpgDmwrr KgSRsd39*CBLf2nJ2NmaSNXK1T@4EVe96HjLs~^_CBO*3}ZXbA)tU}++-7eYi=ZaCs*-1AoDjL?%s-N2w?WD;S9!~;-Omy50uvNTeV gBCA6S)X6VhY{m1tTmFI@>F77zlK*JfA-9J8U7`pxS&nt=HYG!awLhI(iex=+#%-1V*DtMo{UarHW%N_AD zTgY$fnkhmj<}tO7SQgLl<8J=11t)5u+39h>8J=30;eZ4*OhCVR34^F|a3b zur8w_4*c|Puw*V1J)4Vn5fPX6^WUEcfST2N@w9x(8dA2It7^E1GFxoqcr0(()O9be zzMUiE7U*fv((oV+4+%U9l$0FN=W^tiM^O-Htk+Z#CQm#ZyG&Y+WX8zpG22jojW@Uy zYeV{;8e@;!M$NIP&8|;uERE6jBo~9?Mu&jbcE-|T6>c*E**Lk1kic4NEIdA99q#h3 z%}gO2&ll(tSoM>h7;M-zf;$!olxGEp3LR7|^yo3!39R@R^5r+WLuPpdGX4>Fj5d?l zI{YI=MT-OoBycA2SxJhZ4Hs~ifJJ{zE3e|7z_PL=No11q{fm(}R^YFxekT?U+&qQe z=4S;^&^KJlsl(1?Kqknug)h^Zk>{SxtlE1M$x-Q-Fw4)cKYjHyfN(=c)3|!P)&v%wgim? Jz`1Hc_z$H1hf4qe literal 0 HcmV?d00001 diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index e6f7350b..7e6d2ddf 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -2,34 +2,34 @@ - + - + - + - + - + - + @@ -41,7 +41,7 @@ - + @@ -60,7 +60,7 @@ - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index d3239fb7..e4469323 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=3cd401ae -nbproject/build-impl.xml.script.CRC32=b5ddf432 +nbproject/build-impl.xml.data.CRC32=6787cdaf +nbproject/build-impl.xml.script.CRC32=d806451a nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index a86a2bf6..00f9b60d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -108,7 +108,7 @@ javadoc.reference.poi-ooxml-3.14-20160307.jar=https://poi.apache.org/apidocs/ javadoc.splitindex=true javadoc.use=true javadoc.version=true -javadoc.windowtitle=jfinancials Web Application +javadoc.windowtitle=JFinancials Web Application lib.dir=${web.docbase.dir}/WEB-INF/lib persistence.xml.dir=${conf.dir} platform.active=default_platform diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java deleted file mode 100644 index 0e260eaa..00000000 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ /dev/null @@ -1,465 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ -package org.mxchange.addressbook.beans.addressbook; - -import java.text.MessageFormat; -import java.util.Calendar; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; -import javax.inject.Inject; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; -import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote; -import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent; -import org.mxchange.jaddressbookcore.events.addressbook.LoadedAddressbookEvent; -import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException; -import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException; -import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; -import org.mxchange.jaddressbookcore.model.addressbook.UserAddressbook; -import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.model.user.User; - -/** - * An address book bean (controller) - *

- * @author Roland Häder - */ -@Named ("addressbookController") -@SessionScoped -public class AddressbookWebSessionBean extends BaseAddressbookController implements AddressbookWebSessionController { - - /** - * Map for count of user's shared addresses - */ - private static ConcurrentMap countSharesList; - - /** - * Serial number - */ - private static final long serialVersionUID = 185_781_756_712_969L; - - /** - * Address book instance - */ - private Addressbook addressbook; - - /** - * Remote address book bean - */ - private AddressbookSessionBeanRemote addressbookBean; - - /** - * When this address book has been created - */ - private Calendar addressbookCreated; - - /** - * Address book id number (from URL for example) - */ - private Long addressbookId; - - /** - * Name of the address book - */ - private String addressbookName; - - /** - * Who owns this address book - */ - private User addressbookUser; - - /** - * Event fired when user has logged in - */ - @Inject - @Any - private Event loadedEvent; - - /** - * Login controller - */ - @Inject - private AddressbookUserLoginWebSessionController loginController; - - /** - * A list of all user's address books - */ - private List usersAddressbooks; - - /** - * Default constructor - */ - public AddressbookWebSessionBean () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - - // Init list - AddressbookWebSessionBean.countSharesList = new ConcurrentHashMap<>(0); - } - - @Override - public String addAddressbook () { - // Is this name already used? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } else if (this.getAddressbookName() == null) { - // Address book name is null - throw new NullPointerException("addressbookName is null"); //NOI18N - } else if (this.getAddressbookName().isEmpty()) { - // Address book name is empty - throw new IllegalStateException("addressbookName is empty."); //NOI18N - } else if (this.isAddressbookNameUsed(this.getAddressbookName())) { - // Already used by this user - throw new FaceletException(MessageFormat.format("Address book name {0} already used.", this.getAddressbookName())); //NOI18N - } - - // Create address book instance with name - Addressbook book = new UserAddressbook(this.getAddressbookName(), this.loginController.getLoggedInUser()); - - try { - // Register this address book - Addressbook updatedAddressbook = this.addressbookBean.createAddressbook(book); - - // Remove name - this.setAddressbookName(null); - - // Add address book entry to list - this.usersAddressbooks.add(updatedAddressbook); - - // All fine - return "login_own_addressbooks"; //NOI18N - } catch (final AddressbookNameAlreadyUsedException ex) { - // Throw again as cause - throw new FaceletException(ex); - } - } - - @Override - public void afterAddressbookLoadedEvent (@Observes final AddressbookLoadedEvent event) { - // event should not be null - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddressbook() == null) { - // Throw NPE again - throw new NullPointerException("event.addressbook is null"); //NOI18N - } else if (event.getAddressbook().getAddressbookId() == null) { - // And again a NPE - throw new NullPointerException("event.addressbook.addressbookId is null"); //NOI18N - } else if (event.getAddressbook().getAddressbookId() < 1) { - // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("Address book instance {0} has invalid id number: {1}", event.getAddressbook(), event.getAddressbook().getAddressbookId())); //NOI18N - } else if (event.getAddressbook().getAddressbookUser() == null) { - // One more NPE ... - throw new NullPointerException("event.addressbook.addressbookUser is null"); //NOI18N - } - - // Get address book instance - Addressbook book = event.getAddressbook(); - - // Set address book data - this.setAddressbookId(book.getAddressbookId()); - this.setAddressbookName(book.getAddressbookName()); - this.setAddressbookUser(book.getAddressbookUser()); - this.setAddressbookCreated(book.getAddressbookCreated()); - - // And instance ... - this.setAddressbook(book); - } - - @Override - public void afterLoginEvent (@Observes final UserLoggedInEvent event) { - // Is the user logged in? - if (null == event) { - // Is null - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getLoggedInUser()== null) { - // user is null - throw new NullPointerException("event.user is null"); //NOI18N - } else if (!event.getLoggedInUser().equals(this.loginController.getLoggedInUser())) { - // Not matching - throw new IllegalStateException("event.user and loginController.loggedInUser don't match."); //NOI18N - } else if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Init user's address book list - this.initAddressbookList(); - } - - @Override - public List allAddressbooks () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - return Collections.unmodifiableList(this.usersAddressbooks); - } - - @Override - public List allEntries (final Addressbook addressbook) { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Ask the bean - return this.addressbookBean.allEntries(addressbook); - } - - @Override - public int allEntriesSize (final Addressbook addressbook) { - // Ask the bean - return this.allEntries(addressbook).size(); - } - - @Override - public List allUsersNotSharing () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Call EJB - return this.addressbookBean.allUsersNotSharing(this.loginController.getLoggedInUser(), this.getAddressbook()); - } - - @Override - public Integer countAllUserSharedAddressbooks (final User user) { - // Is there cache? - if (AddressbookWebSessionBean.countSharesList.containsKey(user)) { - // Return it instead - return AddressbookWebSessionBean.countSharesList.get(user); - } - - // Call EJB ("expensive") - Integer count = this.addressbookBean.countAllUserSharedAddressbooks(user); - - // Add to list - AddressbookWebSessionBean.countSharesList.put(user, count); - - // Return it - return count; - } - - @Override - public Addressbook getAddressbook () { - return this.addressbook; - } - - @Override - public void setAddressbook (final Addressbook addressbook) { - this.addressbook = addressbook; - } - - @Override - public Calendar getAddressbookCreated () { - return this.addressbookCreated; - } - - @Override - public void setAddressbookCreated (final Calendar addressbookCreated) { - this.addressbookCreated = addressbookCreated; - } - - @Override - public Long getAddressbookId () { - return this.addressbookId; - } - - @Override - public void setAddressbookId (final Long addressbookId) { - this.addressbookId = addressbookId; - } - - @Override - public String getAddressbookName () { - return this.addressbookName; - } - - @Override - public void setAddressbookName (final String addressbookName) { - this.addressbookName = addressbookName; - } - - @Override - public User getAddressbookUser () { - return this.addressbookUser; - } - - @Override - public void setAddressbookUser (final User addressbookUser) { - this.addressbookUser = addressbookUser; - } - - @Override - public boolean hasCreatedAddressbooks () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Check if the list is filled - return (!this.usersAddressbooks.isEmpty()); - } - - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Init list - this.usersAddressbooks = new LinkedList<>(); - - // Is the user logged-in? - if (this.loginController.isUserLoggedIn()) { - // Initialize list - this.initAddressbookList(); - } - - // TODO Initialize list from bean with just one call - //this.addressbookBean.getUserCountMap() - } - - @Override - public boolean isAddressbookLoaded () { - return ((this.getAddressbookId() instanceof Long) && - (this.getAddressbookName() instanceof String) && - (!this.getAddressbookName().isEmpty()) && - (this.getAddressbookUser() instanceof User)); - } - - @Override - public boolean isAddressbookNameUsed (final String addressbookName) { - // Is it zero size? - if (null == addressbookName) { - // Is null - throw new NullPointerException("addressbookName is null"); //NOI18N - } else if (this.usersAddressbooks.isEmpty()) { - // Not found! - return false; - } - - // Default is not found - boolean isFound = false; - - // Check all entries - for (final Addressbook book : this.usersAddressbooks) { - // Is the name same? - if (book.getAddressbookName().equals(addressbookName)) { - // Found a match - isFound = true; - break; - } - } - - // Return status - return isFound; - } - - @Override - public boolean isOtherAddressbook () { - // Just call the other method and invert it - return (!this.isOwnAddressbook()); - } - - @Override - public boolean isOwnAddressbook () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // No, then no own address book - throw new IllegalStateException("isOwnAddressbook() has been invoked for a guest account"); //NOI18N - } - - // Is same user? - return Objects.equals(this.getAddressbookUser(), this.loginController.getLoggedInUser()); - } - - @Override - public boolean loadAddressbook () { - // Check if the id is set - if (this.getAddressbookId() == null) { - // Throw NPE - throw new NullPointerException("this.addressbookId is null"); - } else if (this.getAddressbookId() < 1) { - // Not valid id - throw new IllegalStateException(MessageFormat.format("this.addressbook={0} is invalid", this.getAddressbookId())); - } - - // Default is not found - boolean isFound = false; - - try { - // Then try to look it up - Addressbook a = this.addressbookBean.getAddressbookById(this.getAddressbookId()); - - // Fire event here - this.loadedEvent.fire(new LoadedAddressbookEvent(a)); - - // Found it - isFound = true; - } catch (final AddressbookNotFoundException ex) { - // Not found! - throw new FaceletException(ex); - } - - // Return status - return isFound; - } - - /** - * Initializes the user user's address book list - */ - private void initAddressbookList () { - // Get user instance - User user = this.loginController.getLoggedInUser(); - - // Fill list with entries - this.usersAddressbooks = this.addressbookBean.getUsersAddressbookList(user); - } -} diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java deleted file mode 100644 index 8b71fec2..00000000 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionController.java +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ -package org.mxchange.addressbook.beans.addressbook; - -import java.io.Serializable; -import java.util.Calendar; -import java.util.List; -import org.mxchange.jaddressbookcore.events.addressbook.AddressbookLoadedEvent; -import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; -import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.model.user.User; - -/** - * An interface for address book beans - *

- * @author Roland Häder - */ -public interface AddressbookWebSessionController extends Serializable { - - /** - * Checks whether the user has created addressbooks. For this method to work - * it is vital that the user is logged into his/her account. - *

- * @return Whether the user has created at least one addressbook - */ - boolean hasCreatedAddressbooks (); - - /** - * Creates a new address book with a name and redirects to proper target. - * For this method to work it is vital that the user is logged into his/her - * account. - *

- * @return Target to redirect to - */ - String addAddressbook (); - - /** - * Getter for address book name - *

- * @return Address book name - */ - String getAddressbookName (); - - /** - * Setter for address book name - *

- * @param addressbookName Address book name - */ - void setAddressbookName (final String addressbookName); - - /** - * Checks if the given address book name is already used by the user. - *

- * @param addressbookName Address book name to check - *

- * @return Whether the name has already been used by the user - */ - boolean isAddressbookNameUsed (final String addressbookName); - - /** - * Returns all address books with this user - *

- * @return A list of all address books by this user - */ - List allAddressbooks (); - - /** - * Returns a list of all address book entries for given address book - *

- * @param addressbook Address book instance - *

- * @return List of all entries - */ - List allEntries (final Addressbook addressbook); - - /** - * Size of all entries in given address book - *

- * @param addressbook Address book instance - *

- * @return Size of the entries in address book - */ - int allEntriesSize (final Addressbook addressbook); - - /** - * Getter for address book id number - *

- * @return Address book id number - */ - Long getAddressbookId (); - - /** - * Setter for address book id number - *

- * @param addressbookId Address book id number - */ - void setAddressbookId (final Long addressbookId); - - /** - * Getter for address book user (owner) - *

- * @return Address book user (owner) - */ - User getAddressbookUser (); - - /** - * Setter for address book user (owner) - *

- * @param addressbookUser Address book user (owner) - */ - void setAddressbookUser (final User addressbookUser); - - /** - * Getter for when the address book has been created - *

- * @return When the address book has been created - */ - Calendar getAddressbookCreated (); - - /** - * Setter for when the address book has been created - *

- * @param addressbookCreated When the address book has been created - */ - void setAddressbookCreated (final Calendar addressbookCreated); - - /** - * This method is called when an address book has been successfully loaded - * from JPA. - *

- * @param event Event with address book instance - */ - void afterAddressbookLoadedEvent (final AddressbookLoadedEvent event); - - /** - * Count all shared address books by given user id - *

- * @param user User instance to look for - *

- * @return Count of user's shared address books - */ - Integer countAllUserSharedAddressbooks (final User user); - - /** - * This method is called when a user has successfully logged in his/her - * account. - *

- * @param event - */ - void afterLoginEvent (final UserLoggedInEvent event); - - /** - * Checks if the user is logged in and if so if it matches the current - * address book owner. - *

- * @return Whether the owner matches currently logged-in user - */ - boolean isOwnAddressbook (); - - /** - * Checks if the owner of the current address book is NOT matching the - * logged-in user. - *

- * @return Whether the user does NOT match - */ - boolean isOtherAddressbook (); - - /** - * Getter for address book instance - *

- * @return Address book instance - */ - Addressbook getAddressbook (); - - /** - * Setter for address book instance - *

- * @param addressbook Address book instance - */ - void setAddressbook (final Addressbook addressbook); - - /** - * Retrieves a list of all users this user is not sharing this address book - * with. - *

- * @return List of not sharing users - */ - List allUsersNotSharing (); - - /** - * Checks wether an address book has been loaded by checking the id number. - *

- * @return Whether the address book is loaded - */ - boolean isAddressbookLoaded (); - - /** - * Loads address book from current id - *

- * @return Whether the address book was found - */ - boolean loadAddressbook (); -} diff --git a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java deleted file mode 100644 index d2a9a127..00000000 --- a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java +++ /dev/null @@ -1,345 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ -package org.mxchange.addressbook.beans.shares; - -import java.text.MessageFormat; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; -import javax.inject.Inject; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; -import org.mxchange.addressbook.model.shared.SharedAddressbooksSessionBeanRemote; -import org.mxchange.jaddressbookcore.events.sharing.AddressbookSharingEvent; -import org.mxchange.jaddressbookcore.events.sharing.StartedAddressbookSharingEvent; -import org.mxchange.jaddressbookcore.events.sharing.type.SharingType; -import org.mxchange.jaddressbookcore.exceptions.UserAlreadySharingAddressbookException; -import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; -import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.model.user.User; -import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; - -/** - * A bean for sharing address books with other users - *

- * @author Roland Häder - */ -@Named (value = "shareController") -@SessionScoped -public class AddressbookSharesWebSessionBean extends BaseAddressbookController implements AddressbookSharesWebSessionController { - - /** - * Serial number - */ - private static final long serialVersionUID = 19_868_976_871_976_780L; - - /** - * Cached flag whether the user is sharing address books - */ - private Boolean isUserSharing = null; - - /** - * Login controller injection - */ - @Inject - private AddressbookUserLoginWebSessionController loginController; - - /** - * Share instance - */ - private ShareableAddressbook share; - - /** - * Remote bean for sharing address books - */ - private SharedAddressbooksSessionBeanRemote shareBean; - - /** - * A list of all user's shared (with others) address books - */ - private List sharedAddressbooks; - - /** - * User id of sharee - */ - private Long shareeUserId; - - /** - * An event triggered when address book sharing starts or ends - */ - @Inject - @Any - private Event sharingEvent; - - /** - * Default constructor - */ - public AddressbookSharesWebSessionBean () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Look up bean - this.shareBean = (SharedAddressbooksSessionBeanRemote) context.lookup("ejb/stateless-addressbook-share"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw - throw new FaceletException(ex); - } - } - - @Override - public void afterAdressbookShareEnded (@Observes final AddressbookSharingEvent event) { - // Validate parameter - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getSharingType() == null) { - // Throw NPE - throw new NullPointerException("event.sharingType is null"); //NOI18N - } else if (event.getSharingType() != SharingType.ENDED) { - // Wrong event - return; - } - - // Validate event - this.validateEvent(event); - - // Add it to list - this.sharedAddressbooks.remove(event.getShareableAddressbook()); - } - - @Override - public void afterAdressbookShareStarted (@Observes final AddressbookSharingEvent event) { - // Validate parameter - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getSharingType() == null) { - // Throw NPE - throw new NullPointerException("event.sharingType is null"); //NOI18N - } else if (event.getSharingType() != SharingType.STARTED) { - // Wrong event - return; - } - - // Validate event - this.validateEvent(event); - - // Add it to list - this.sharedAddressbooks.add(event.getShareableAddressbook()); - } - - @Override - public void afterLoginEvent (@Observes final UserLoggedInEvent event) { - // Is the user logged in? - if (null == event) { - // Is null - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getLoggedInUser() == null) { - // user is null - throw new NullPointerException("event.user is null"); //NOI18N - } - - // Init share list - this.sharedAddressbooks = this.shareBean.allSharedAddressbooks(event.getLoggedInUser()); - } - - @Override - public List allShares () { - // Is the user logged in? - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - return Collections.unmodifiableList(this.sharedAddressbooks); - } - - @Override - public ShareableAddressbook getShare () { - return this.share; - } - - @Override - public void setShare (final ShareableAddressbook share) { - this.share = share; - } - - @Override - public Long getShareeUserId () { - return this.shareeUserId; - } - - @Override - public void setShareeUserId (final Long shareeUserId) { - this.shareeUserId = shareeUserId; - } - - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - } - - @Override - public boolean isShareeUserIdEmpty () { - return (!this.isShareeUserIdSet()); - } - - @Override - public boolean isShareeUserIdSet () { - return ((this.getShareeUserId() instanceof Long) && (this.getShareeUserId() > 0)); - } - - @Override - public boolean isSharingAddressbooks () { - // Only to be called for logged-in users - if (!this.loginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } else if (this.isUserSharing instanceof Boolean) { - // Return cached value - return this.isUserSharing; - } - - // Call the proper bean - this.isUserSharing = this.shareBean.isUserSharingAddressbooks(this.loginController.getLoggedInUser()); - - // Return it - return this.isUserSharing; - } - - @Override - public String startSharing (final User user, final Addressbook addressbook) { - // Check conditions - if (!this.loginController.isUserLoggedIn()) { - // No, then throw exception - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } else if (null == user) { - // Throw NPE - throw new NullPointerException("user is null"); //NOI18N - } else if (user.getUserId() == null) { - // Throw NPE again - throw new NullPointerException("user.userId is null"); //NOI18N - } else if (user.getUserId() < 1) { - // Invalid id number - throw new IllegalStateException(MessageFormat.format("user.userId={0} is invalid", user.getUserId())); //NOI18N - } else if (Objects.equals(user, this.loginController.getLoggedInUser())) { - // Sharing with yourself! - throw new IllegalStateException("User tries to share with himself."); //NOI18N - } else if (null == addressbook) { - // Throw NPE again - throw new NullPointerException("addressbook is null"); //NOI18N - } else if (addressbook.getAddressbookId() == null) { - // Throw NPE again - throw new NullPointerException("addressbook.addressbookId is null"); //NOI18N - } else if (addressbook.getAddressbookId() < 1) { - // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("addressbook.addressbookId={0} is invalid.", addressbook.getAddressbookId())); //NOI18N - } else if (!Objects.equals(addressbook.getAddressbookUser(), this.loginController.getLoggedInUser())) { - // Not the same user! - throw new IllegalStateException(MessageFormat.format("Address book id {0} owner id {1} mismatching logged-in user id {2}", addressbook.getAddressbookId(), addressbook.getAddressbookUser().getUserId(), this.loginController.getLoggedInUser().getUserId())); //NOI18N - } else if (this.loginController.getLoggedInUser().getUserProfileMode() == ProfileMode.INVISIBLE) { - // User is invisible - throw new FaceletException(MessageFormat.format("user {0} is invisible and cannot start sharing address books.", this.loginController.getLoggedInUser().getUserId())); //NOI18N - } else if (user.getUserProfileMode() == ProfileMode.INVISIBLE) { - // User is invisible - throw new FaceletException(MessageFormat.format("user {0} is invisible and cannot be selected for sharing.", user.getUserId())); //NOI18N - } - - try { - // Init sharing - ShareableAddressbook shared = this.shareBean.startSharing(user, addressbook); - - // TODO Set it here - this.setShare(shared); - - /// Trigger event - this.sharingEvent.fire(new StartedAddressbookSharingEvent(shared)); - } catch (final UserAlreadySharingAddressbookException ex) { - // Throw again - throw new FaceletException(ex); - } - - // TODO Unfinished - return null; - } - - /** - * Validates given event for all values and throws exceptions - *

- * @param event Event to validate - */ - private void validateEvent (final AddressbookSharingEvent event) { - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getSharingType() == null) { - // Throw NPE - throw new NullPointerException("event.sharingType is null"); //NOI18N - } else if (event.getShareableAddressbook() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareId() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareId is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareId() < 1) { - // Throw NPE again - throw new IllegalArgumentException(MessageFormat.format("event.shareableAddressbook.shareId={0} is invalid", event.getShareableAddressbook().getShareId())); //NOI18N - } else if (event.getShareableAddressbook().getShareAddressbook() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareAddressbook is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareAddressbook().getAddressbookId() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareAddressbook.addressbookId is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareAddressbook().getAddressbookId() < 1) { - // Throw NPE again - throw new IllegalArgumentException(MessageFormat.format("event.shareableAddressbook.shareAddressbook.addressbookId={0} is invalid", event.getShareableAddressbook().getShareAddressbook().getAddressbookId())); //NOI18N - } else if (event.getShareableAddressbook().getShareUserOwner() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareUserOwner is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareUserOwner().getUserId() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareUserOwner.userId is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareUserOwner().getUserId() < 1) { - // Throw NPE again - throw new IllegalArgumentException(MessageFormat.format("event.shareableAddressbook.shareUserOwner.userId={0} is invalid", event.getShareableAddressbook().getShareUserOwner().getUserId())); //NOI18N - } else if (event.getShareableAddressbook().getShareUserSharee() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareUserSharee is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareUserSharee().getUserId() == null) { - // Throw NPE again - throw new NullPointerException("event.shareableAddressbook.shareUserSharee.userId is null"); //NOI18N - } else if (event.getShareableAddressbook().getShareUserSharee().getUserId() < 1) { - // Throw NPE again - throw new IllegalArgumentException(MessageFormat.format("event.shareableAddressbook.shareUserSharee.userId={0} is invalid", event.getShareableAddressbook().getShareUserOwner().getUserId())); //NOI18N - } - } -} diff --git a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java deleted file mode 100644 index 066dc2ec..00000000 --- a/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2016 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 . - */ -package org.mxchange.addressbook.beans.shares; - -import java.io.Serializable; -import java.util.List; -import org.mxchange.jaddressbookcore.events.sharing.AddressbookSharingEvent; -import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; -import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook; -import org.mxchange.jusercore.events.login.UserLoggedInEvent; -import org.mxchange.jusercore.model.user.User; - -/** - * Controller interface sharing address books - *

- * @author Roland Häder - */ -public interface AddressbookSharesWebSessionController extends Serializable { - - /** - * Observer method for ended sharing events - *

- * @param event Event instance - */ - void afterAdressbookShareEnded (final AddressbookSharingEvent event); - - /** - * Observer method for started sharing events - *

- * @param event Event instance - */ - void afterAdressbookShareStarted (final AddressbookSharingEvent event); - - /** - * This method is called when a user has successfully logged in his/her - * account. - *

- * @param event - */ - void afterLoginEvent (final UserLoggedInEvent event); - - /** - * Returns a list of all address books the user is sharing with others. - *

- * @return List of all shared address books - */ - List allShares (); - - /** - * Getter for share instance - *

- * @return Share instance - */ - ShareableAddressbook getShare (); - - /** - * Setter for share instance - *

- * @param share Share instance - */ - void setShare (final ShareableAddressbook share); - - /** - * Getter for sharee's user id - *

- * @return Sharee's user id - */ - Long getShareeUserId (); - - /** - * Setter for sharee's user id - *

- * @param shareeUserId Sharee's user id - */ - void setShareeUserId (final Long shareeUserId); - - /** - * Checks if the sharee's user id is empty. - *

- * @return Whether the sharee's user id is empty. - */ - boolean isShareeUserIdEmpty (); - - /** - * Checks whether the sharee's user id is set - *

- * @return Whether the sharee's user id is set - */ - boolean isShareeUserIdSet (); - - /** - * Checks wether the current user is sharing address books with others - *

- * @return Whether the current user is sharing address books - */ - boolean isSharingAddressbooks (); - - /** - * Starts an address book share between currently logged-in user and - * assigned user for current address book. - *

- * @param user User instance - * @param addressbook Address book instance - *

- * @return Redirect target - */ - String startSharing (final User user, final Addressbook addressbook); -} diff --git a/src/java/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java b/src/java/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java deleted file mode 100644 index fb0e0349..00000000 --- a/src/java/org/mxchange/addressbook/validator/addressbook/AddressbookIdValidator.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2016 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.addressbook.validator.addressbook; - -import java.text.MessageFormat; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote; -import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException; -import org.mxchange.jaddressbookcore.model.addressbook.Addressbook; -import org.mxchange.jcoreee.validator.number.BaseLongValidator; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; - -/** - * A validator for address book id verification - *

- * @author Roland Häder - */ -@FacesValidator (value = "AddressbookIdValidator") -public class AddressbookIdValidator extends BaseLongValidator { - - /** - * Serial number - */ - private static final long serialVersionUID = 158_768_467_186_951_809L; - - /** - * Remote bean - */ - private AddressbookSessionBeanRemote addressbookBean; - - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - - /** - * Public consutructor - */ - public AddressbookIdValidator () { - // 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.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N - } - } - - @Override - public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { - // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N - - // All accepted, required fields - String[] requiredFields = {"addressbookId"}; //NOI18N - - // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, false); - - // Cast to long - Long addressbookId = (Long) value; - - // Is the address book id valid? - if (!this.addressbookBean.isAddressbookIdUsed(addressbookId)) { - // Is not valid - throw new ValidatorException(new FacesMessage(MessageFormat.format("No address book found with id {0}. Please check your link.", addressbookId))); //NOI18N - } - - // Init variable - Addressbook addressbook; - - // Try it - try { - // Get full data - addressbook = this.addressbookBean.getAddressbookById(addressbookId); - - // Is it set? - if (null == addressbook) { - // Is null?! - throw new NullPointerException(MessageFormat.format("addressbook for id={0} is null", addressbookId)); //NOI18N - } - } catch (final AddressbookNotFoundException ex) { - // Continue to throw - throw new ValidatorException(new FacesMessage(MessageFormat.format("Cannot find address book with id {0}", addressbookId)), ex); //NOI18N - } - - // Trace message - this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N - } -} diff --git a/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java b/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java deleted file mode 100644 index ecf00a90..00000000 --- a/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2016 Roland Häder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.addressbook.validator.names; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; -import org.mxchange.jcoreee.validator.string.BaseStringValidator; - -/** - * A validation class for addressbook names, such as first name or family name. - *

- * @author Roland Häder - */ -@FacesValidator (value = "NameValidator") -public class AddressbookNameValidator extends BaseStringValidator implements Validator { - - /** - * Serial number - */ - private static final long serialVersionUID = 27_587_896_710_689_451L; - - @Override - public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { - // Trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N - - // All accepted, required fields - String[] requiredFields = {"addressbookName"}; //NOI18N - - // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, false); - - // Trace message - //* NOISY-DEBUG: */ System.out.println("validate: EXIT!"); //NOI18N - } -} diff --git a/src/java/org/mxchange/addressbook/beans/BaseAddressbookController.java b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/BaseAddressbookController.java rename to src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java index 547720e1..29b2b81c 100644 --- a/src/java/org/mxchange/addressbook/beans/BaseAddressbookController.java +++ b/src/java/org/mxchange/jfinancials/beans/BaseFinancialsController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans; +package org.mxchange.jfinancials.beans; import java.io.Serializable; import java.text.MessageFormat; @@ -26,7 +26,7 @@ import javax.faces.context.FacesContext; *

* @author Roland Häder */ -public abstract class BaseAddressbookController implements Serializable { +public abstract class BaseFinancialsController implements Serializable { /** * Serial number diff --git a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java index 319f675f..1dbe883c 100644 --- a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.confirmlink; +package org.mxchange.jfinancials.beans.confirmlink; import java.text.MessageFormat; import java.util.Iterator; @@ -29,9 +29,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jusercore.events.confirmation.ConfirmedUserAccountEvent; import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; @@ -40,6 +38,8 @@ import org.mxchange.jusercore.exceptions.UserStatusLockedException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A web request bean for confirmation link handling @@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("confirmationLinkController") @RequestScoped -public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookController implements AddressbookConfirmationLinkWebRequestController { +public class FinancialsConfirmationLinkWebRequestBean extends BaseFinancialsController implements FinancialsConfirmationLinkWebRequestController { /** * Serial number @@ -59,7 +59,7 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo * Admin helper instance */ @Inject - private AddressbookWebRequestController beanHelper; + private FinancialsWebRequestController beanHelper; /** * Confirmation key @@ -75,7 +75,7 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo * User controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Event being fired when a user has confirmed the account @@ -87,14 +87,14 @@ public class AddressbookConfirmationLinkWebRequestBean extends BaseAddressbookCo /** * Default constructor */ - public AddressbookConfirmationLinkWebRequestBean () { + public FinancialsConfirmationLinkWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestController.java index 457deabc..3051e932 100644 --- a/src/java/org/mxchange/addressbook/beans/confirmlink/AddressbookConfirmationLinkWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/confirmlink/FinancialsConfirmationLinkWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.confirmlink; +package org.mxchange.jfinancials.beans.confirmlink; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface AddressbookConfirmationLinkWebRequestController extends Serializable { +public interface FinancialsConfirmationLinkWebRequestController extends Serializable { /** * Getter for confirmation key diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java index ed1d5f50..0f0b9eb7 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact; +package org.mxchange.jfinancials.beans.contact; import java.text.MessageFormat; import java.util.Date; @@ -30,8 +30,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.AdminContactSessionBeanRemote; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; @@ -52,6 +51,7 @@ import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController; /** * An administrative user bean (controller) @@ -60,7 +60,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminContactController") @RequestScoped -public class AddressbookAdminContactWebRequestBean extends BaseAddressbookController implements AddressbookAdminContactWebRequestController { +public class FinancialsAdminContactWebRequestBean extends BaseFinancialsController implements FinancialsAdminContactWebRequestController { /** * Serial number @@ -83,7 +83,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro * Admin helper instance */ @Inject - private AddressbookWebRequestController beanHelper; + private FinancialsWebRequestController beanHelper; /** * Birth day @@ -109,7 +109,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro * General contact controller */ @Inject - private AddressbookContactWebSessionController contactController; + private FinancialsContactWebSessionController contactController; /** * Contact id @@ -246,14 +246,14 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookContro /** * Default constructor */ - public AddressbookAdminContactWebRequestBean () { + public FinancialsAdminContactWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestController.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestController.java index 42251b96..f9c7e8b0 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsAdminContactWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact; +package org.mxchange.jfinancials.beans.contact; import java.io.Serializable; import java.util.Date; @@ -30,7 +30,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; *

* @author Roland Häder */ -public interface AddressbookAdminContactWebRequestController extends Serializable { +public interface FinancialsAdminContactWebRequestController extends Serializable { /** * Adds contact data to database and redirects on success. If the contact is diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java index a40ccddb..675534f2 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact; +package org.mxchange.jfinancials.beans.contact; import java.text.MessageFormat; import java.util.Collections; @@ -32,9 +32,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jcontacts.contact.UserContact; @@ -58,6 +56,8 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A general contact bean (controller) @@ -66,7 +66,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("contactController") @SessionScoped -public class AddressbookContactWebSessionBean extends BaseAddressbookController implements AddressbookContactWebSessionController { +public class FinancialsContactWebSessionBean extends BaseFinancialsController implements FinancialsContactWebSessionController { /** * Serial number @@ -217,13 +217,13 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController * Regular user controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Login bean (controller) */ @Inject - private AddressbookUserLoginWebSessionController userLoginController; + private FinancialsUserLoginWebSessionController userLoginController; /** * ZIP code @@ -233,14 +233,14 @@ public class AddressbookContactWebSessionBean extends BaseAddressbookController /** * Default constructor */ - public AddressbookContactWebSessionBean () { + public FinancialsContactWebSessionBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java index 015ad2c3..ae554ec5 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/FinancialsContactWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact; +package org.mxchange.jfinancials.beans.contact; import java.io.Serializable; import java.util.Date; @@ -39,7 +39,7 @@ import org.mxchange.jusercore.events.user.linked.AdminLinkedUserEvent; * @author Roland Häder */ @Local -public interface AddressbookContactWebSessionController extends Serializable { +public interface FinancialsContactWebSessionController extends Serializable { /** * Minimum password length diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java index 294f8877..6038671b 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact.phone; +package org.mxchange.jfinancials.beans.contact.phone; import java.text.MessageFormat; import java.util.HashMap; @@ -30,14 +30,14 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.events.contact.add.AdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.AdminUpdatedContactEvent; import org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; +import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController; +import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController; /** * A general contact bean (controller) @@ -46,7 +46,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; */ @Named ("contactPhoneController") @SessionScoped -public class AddressbookContactPhoneWebSessionBean extends BaseAddressbookController implements AddressbookContactPhoneWebSessionController { +public class FinancialsContactPhoneWebSessionBean extends BaseFinancialsController implements FinancialsContactPhoneWebSessionController { /** * Serial number @@ -62,13 +62,13 @@ public class AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro * Administrative phone controller */ @Inject - private AddressbookAdminPhoneWebRequestController adminPhoneController; + private FinancialsAdminPhoneWebRequestController adminPhoneController; /** * General contact controller */ @Inject - private AddressbookContactWebSessionController contactController; + private FinancialsContactWebSessionController contactController; /** * "Cache" for contact lists, mostly only one is assigned. So this cache @@ -79,14 +79,14 @@ public class AddressbookContactPhoneWebSessionBean extends BaseAddressbookContro /** * Default constructor */ - public AddressbookContactPhoneWebSessionBean () { + public FinancialsContactPhoneWebSessionBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup the beans - this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminphone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N + this.adminPhoneBean = (AdminPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminphone!org.mxchange.jphone.phonenumbers.phone.AdminPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java index 781bd4c2..a95b7d98 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/contact/phone/FinancialsContactPhoneWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.contact.phone; +package org.mxchange.jfinancials.beans.contact.phone; import java.io.Serializable; import java.util.List; @@ -30,7 +30,7 @@ import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; * @author Roland Häder */ @Local -public interface AddressbookContactPhoneWebSessionController extends Serializable { +public interface FinancialsContactPhoneWebSessionController extends Serializable { /** * Minimum password length @@ -38,7 +38,7 @@ public interface AddressbookContactPhoneWebSessionController extends Serializabl public static final Integer MINIMUM_PASSWORD_LENGTH = 5; /** - * Getter for all contacts having current cellphone instance linked + * Getter for all contacts having current mobile instance linked *

* @return List of all linked contacts */ diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java index 35f9e315..e1bae1fb 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.country; +package org.mxchange.jfinancials.beans.country; import java.util.Iterator; import java.util.List; @@ -28,7 +28,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; import org.mxchange.jcountry.data.CountrySingletonBeanRemote; @@ -43,7 +43,7 @@ import org.mxchange.jcountry.exceptions.CountryAlreadyAddedException; */ @Named ("adminCountryController") @RequestScoped -public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookController implements AddressbookAdminCountryWebRequestController { +public class FinancialsAdminCountryWebRequestBean extends BaseFinancialsController implements FinancialsAdminCountryWebRequestController { /** * Serial number @@ -76,7 +76,7 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro * Regular country controller */ @Inject - private AddressbookCountryWebApplicationController countryController; + private FinancialsCountryWebApplicationController countryController; /** * Local dial prefix @@ -101,14 +101,14 @@ public class AddressbookAdminCountryWebRequestBean extends BaseAddressbookContro /** * Default constructor */ - public AddressbookAdminCountryWebRequestBean () { + public FinancialsAdminCountryWebRequestBean () { // Try this try { // Get initial context Context context = new InitialContext(); // Try to lookup the bean - this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N + this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestController.java similarity index 95% rename from src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestController.java index e430c6bc..3b28164a 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookAdminCountryWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsAdminCountryWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.country; +package org.mxchange.jfinancials.beans.country; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface AddressbookAdminCountryWebRequestController extends Serializable { +public interface FinancialsAdminCountryWebRequestController extends Serializable { /** * Adds country to all relevant beans and sends it to the EJB. A redirect diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java rename to src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java index 7e890d2a..c62e2914 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.country; +package org.mxchange.jfinancials.beans.country; import java.text.MessageFormat; import java.util.List; @@ -26,7 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountrySingletonBeanRemote; import org.mxchange.jcountry.events.AdminAddedCountryEvent; @@ -38,7 +38,7 @@ import org.mxchange.jcountry.events.AdminAddedCountryEvent; */ @Named ("countryController") @ApplicationScoped -public class AddressbookCountryWebApplicationBean extends BaseAddressbookController implements AddressbookCountryWebApplicationController { +public class FinancialsCountryWebApplicationBean extends BaseFinancialsController implements FinancialsCountryWebApplicationController { /** * Serial number @@ -58,14 +58,14 @@ public class AddressbookCountryWebApplicationBean extends BaseAddressbookControl /** * Default constructor */ - public AddressbookCountryWebApplicationBean () { + public FinancialsCountryWebApplicationBean () { // Try this try { // Get initial context Context context = new InitialContext(); // Try to lookup the bean - this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N + this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java rename to src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java index 16d43f90..cf7a3d7f 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java +++ b/src/java/org/mxchange/jfinancials/beans/country/FinancialsCountryWebApplicationController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.country; +package org.mxchange.jfinancials.beans.country; import java.io.Serializable; import java.util.List; @@ -26,7 +26,7 @@ import org.mxchange.jcountry.events.AdminAddedCountryEvent; *

* @author Roland Häder */ -public interface AddressbookCountryWebApplicationController extends Serializable { +public interface FinancialsCountryWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java similarity index 91% rename from src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java index 4a42d5a2..cb3d8265 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.email_address; +package org.mxchange.jfinancials.beans.email_address; import java.text.MessageFormat; import java.util.List; @@ -26,9 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; @@ -36,6 +34,8 @@ import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.email_address.UserEmailChangeSessionBeanRemote; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; /** * A web session bean for changing email addresses @@ -44,7 +44,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("emailChangeController") @SessionScoped -public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookController implements AddressbookEmailChangeWebSessionController { +public class FinancialsEmailChangeWebSessionBean extends BaseFinancialsController implements FinancialsEmailChangeWebSessionController { /** * Serial number @@ -75,25 +75,25 @@ public class AddressbookEmailChangeWebSessionBean extends BaseAddressbookControl * Features controller */ @Inject - private AddressbookFeaturesWebApplicationController featureController; + private FinancialsFeaturesWebApplicationController featureController; /** * Login bean (controller) */ @Inject - private AddressbookUserLoginWebSessionController userLoginController; + private FinancialsUserLoginWebSessionController userLoginController; /** * Default constructor */ - public AddressbookEmailChangeWebSessionBean () { + public FinancialsEmailChangeWebSessionBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.emailBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/addressbook-ejb/email-change!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N + this.emailBean = (UserEmailChangeSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/email-change!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N // Init list this.emailAddresses = this.emailBean.allQueuedAddresses(); diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionController.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionController.java index 3e20719a..5c921462 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/email_address/FinancialsEmailChangeWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.email_address; +package org.mxchange.jfinancials.beans.email_address; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface AddressbookEmailChangeWebSessionController extends Serializable { +public interface FinancialsEmailChangeWebSessionController extends Serializable { /** * Getter for email address 1 (changing) diff --git a/src/java/org/mxchange/addressbook/beans/features/AddressbookFeatureWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java similarity index 87% rename from src/java/org/mxchange/addressbook/beans/features/AddressbookFeatureWebApplicationBean.java rename to src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java index d0dc07b5..2411781b 100644 --- a/src/java/org/mxchange/addressbook/beans/features/AddressbookFeatureWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeatureWebApplicationBean.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.features; +package org.mxchange.jfinancials.beans.features; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; /** * A feature bean @@ -27,7 +27,7 @@ import org.mxchange.addressbook.beans.BaseAddressbookController; */ @Named ("featureController") @ApplicationScoped -public class AddressbookFeatureWebApplicationBean extends BaseAddressbookController implements AddressbookFeaturesWebApplicationController { +public class FinancialsFeatureWebApplicationBean extends BaseFinancialsController implements FinancialsFeaturesWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/addressbook/beans/features/AddressbookFeaturesWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeaturesWebApplicationController.java similarity index 88% rename from src/java/org/mxchange/addressbook/beans/features/AddressbookFeaturesWebApplicationController.java rename to src/java/org/mxchange/jfinancials/beans/features/FinancialsFeaturesWebApplicationController.java index 72322753..238eeff1 100644 --- a/src/java/org/mxchange/addressbook/beans/features/AddressbookFeaturesWebApplicationController.java +++ b/src/java/org/mxchange/jfinancials/beans/features/FinancialsFeaturesWebApplicationController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.features; +package org.mxchange.jfinancials.beans.features; import java.io.Serializable; import javax.ejb.Local; @@ -25,7 +25,7 @@ import javax.ejb.Local; * @author Roland Häder */ @Local -public interface AddressbookFeaturesWebApplicationController extends Serializable { +public interface FinancialsFeaturesWebApplicationController extends Serializable { /** * Checks if given feature is enabled. diff --git a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java similarity index 82% rename from src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java rename to src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java index 048441ec..0883dbfa 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationBean.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.gender; +package org.mxchange.jfinancials.beans.gender; import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcontacts.contact.gender.GenderUtils; @@ -30,7 +30,7 @@ import org.mxchange.jcontacts.contact.gender.GenderUtils; */ @Named ("genderController") @ApplicationScoped -public class AddressbookGenderWebApplicationBean extends BaseAddressbookController implements AddressbookGenderWebApplicationController { +public class FinancialsGenderWebApplicationBean extends BaseFinancialsController implements FinancialsGenderWebApplicationController { /** * Serial number @@ -40,7 +40,7 @@ public class AddressbookGenderWebApplicationBean extends BaseAddressbookControll /** * Default constructor */ - public AddressbookGenderWebApplicationBean () { + public FinancialsGenderWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java rename to src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationController.java index 2edc491d..29d93763 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java +++ b/src/java/org/mxchange/jfinancials/beans/gender/FinancialsGenderWebApplicationController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.gender; +package org.mxchange.jfinancials.beans.gender; import java.io.Serializable; import java.util.List; @@ -25,7 +25,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; *

* @author Roland Häder */ -public interface AddressbookGenderWebApplicationController extends Serializable { +public interface FinancialsGenderWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestController.java index 5f9cb562..532b030f 100644 --- a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.helper; +package org.mxchange.jfinancials.beans.helper; import java.io.Serializable; import org.mxchange.jcontacts.contact.Contact; @@ -25,7 +25,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -public interface AddressbookWebRequestController extends Serializable { +public interface FinancialsWebRequestController extends Serializable { /** * Getter for user instance diff --git a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelper.java b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelper.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelper.java rename to src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelper.java index 9ed6d04b..548b801a 100644 --- a/src/java/org/mxchange/addressbook/beans/helper/AddressbookWebRequestHelper.java +++ b/src/java/org/mxchange/jfinancials/beans/helper/FinancialsWebRequestHelper.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.helper; +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.addressbook.beans.contact.AddressbookAdminContactWebRequestController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; -import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestController; +import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController; +import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A general helper for beans @@ -36,7 +36,7 @@ import org.mxchange.addressbook.beans.phone.AddressbookAdminPhoneWebRequestContr */ @Named ("adminHelper") @RequestScoped -public class AddressbookWebRequestHelper implements AddressbookWebRequestController { +public class FinancialsWebRequestHelper implements FinancialsWebRequestController { /** * Serial number @@ -47,13 +47,13 @@ public class AddressbookWebRequestHelper implements AddressbookWebRequestControl * Administrative contact controller */ @Inject - private AddressbookAdminContactWebRequestController adminContactController; + private FinancialsAdminContactWebRequestController adminContactController; /** * Administrative phone controller */ @Inject - private AddressbookAdminPhoneWebRequestController adminPhoneController; + private FinancialsAdminPhoneWebRequestController adminPhoneController; /** * Contact instance @@ -69,12 +69,12 @@ public class AddressbookWebRequestHelper implements AddressbookWebRequestControl * Regular user controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Default constructor */ - public AddressbookWebRequestHelper () { + public FinancialsWebRequestHelper () { } @Override @@ -188,7 +188,7 @@ public class AddressbookWebRequestHelper implements AddressbookWebRequestControl } /** - * Set's all given contact's phone instances: land-line, cellphone and fax + * Set's all given contact's phone instances: land-line, mobile and fax *

* @param contact Contact to set phone instances for */ @@ -205,7 +205,7 @@ public class AddressbookWebRequestHelper implements AddressbookWebRequestControl throw new IllegalArgumentException(MessageFormat.format("contact.contactId={0} is not valid", contact.getContactId())); //NOI18N } - // Is cellphone set? + // Is mobile set? if (contact.getContactMobileNumber() instanceof DialableMobileNumber) { // Yes, then set it in admin controller this.adminPhoneController.setCellPhone(contact.getContactMobileNumber()); diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java similarity index 78% rename from src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java index 5db9cef1..bc7ce44f 100644 --- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.localization; +package org.mxchange.jfinancials.beans.localization; import java.text.MessageFormat; import java.util.Locale; @@ -23,7 +23,7 @@ import javax.enterprise.context.SessionScoped; import javax.enterprise.event.Observes; import javax.faces.context.FacesContext; import javax.inject.Named; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent; @@ -37,7 +37,7 @@ import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent; */ @Named ("localizationController") @SessionScoped -public class AddressbookLocalizationSessionBean extends BaseAddressbookController implements AddressbookLocalizationSessionController { +public class FinancialsLocalizationSessionBean extends BaseFinancialsController implements FinancialsLocalizationSessionController { /** * Serial number @@ -105,14 +105,14 @@ public class AddressbookLocalizationSessionBean extends BaseAddressbookControlle @Override public String getLanguage () { - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::getLanguage(): locale.language={0} - EXIT!", this.getLocale().getLanguage())); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::getLanguage(): locale.language={0} - EXIT!", this.getLocale().getLanguage())); //NOI18N return this.getLocale().getLanguage().toLowerCase(); } @Override public void setLanguage (final String language) { // Log trace message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::setLanguage: language={0} - CALLED!", language)); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::setLanguage: language={0} - CALLED!", language)); //NOI18N // Is the language null? if (null == language) { @@ -130,24 +130,24 @@ public class AddressbookLocalizationSessionBean extends BaseAddressbookControlle Locale loc = new Locale(splits[0], splits[1]); // Log debug message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::setLanguage: loc={0}", loc)); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::setLanguage: loc={0}", loc)); //NOI18N // Set it here and in the JSF context this.setLocale(loc); FacesContext.getCurrentInstance().getViewRoot().setLocale(loc); // Log trace message - //* NOISY-DEBUG: */ System.out.println("AddressbookLocalizationSessionBean::setLanguage: EXIT!"); //NOI18N + //* NOISY-DEBUG: */ System.out.println("FinancialsLocalizationSessionBean::setLanguage: EXIT!"); //NOI18N } @Override public Locale getLocale () { - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::getLocale(): locale={0} - EXIT!", this.locale)); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::getLocale(): locale={0} - EXIT!", this.locale)); //NOI18N return this.locale; } @Override public void setLocale (final Locale locale) { - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::setLocale(): locale={0} - CALLED!", locale)); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::setLocale(): locale={0} - CALLED!", locale)); //NOI18N this.locale = locale; } @@ -166,18 +166,18 @@ public class AddressbookLocalizationSessionBean extends BaseAddressbookControlle @PostConstruct public void init () { // Log trace message - //* NOISY-DEBUG: */ System.out.println("AddressbookLocalizationSessionBean::init: CALLED!"); //NOI18N + //* NOISY-DEBUG: */ System.out.println("FinancialsLocalizationSessionBean::init: CALLED!"); //NOI18N // Create locale instance from context Locale loc = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); // Log debug message - //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("AddressbookLocalizationSessionBean::init: loc={0}", loc)); //NOI18N + //* NOISY-DEBUG: */ System.out.println(MessageFormat.format("FinancialsLocalizationSessionBean::init: loc={0}", loc)); //NOI18N // Set it here this.setLocale(loc); // Log trace message - //* NOISY-DEBUG: */ System.out.println("AddressbookLocalizationSessionBean::init: EXIT!"); //NOI18N + //* NOISY-DEBUG: */ System.out.println("FinancialsLocalizationSessionBean::init: EXIT!"); //NOI18N } /** diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java rename to src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java index e0d2b609..dccfbc35 100644 --- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/localization/FinancialsLocalizationSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.localization; +package org.mxchange.jfinancials.beans.localization; import java.io.Serializable; import java.util.Locale; @@ -26,7 +26,7 @@ import org.mxchange.jusercore.events.logout.ObserveableUserLogoutEvent; *

* @author Roland Häder */ -public interface AddressbookLocalizationSessionController extends Serializable { +public interface FinancialsLocalizationSessionController extends Serializable { /** * Event observer for logged-in user diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java similarity index 95% rename from src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java index c9a0eb77..c6cabd0e 100644 --- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.login; +package org.mxchange.jfinancials.beans.login; import java.text.MessageFormat; import java.util.Collections; @@ -31,8 +31,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.login.UserLoggedInEvent; @@ -51,6 +50,7 @@ import org.mxchange.jusercore.model.user.password_history.PasswordHistory; import org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A web bean for user registration @@ -59,7 +59,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("loginController") @SessionScoped -public class AddressbookUserLoginWebSessionBean extends BaseAddressbookController implements AddressbookUserLoginWebSessionController { +public class FinancialsUserLoginWebSessionBean extends BaseFinancialsController implements FinancialsUserLoginWebSessionController { /** * Path name for guest base template @@ -96,7 +96,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle * User controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Flag whether the user has logged-in, set only from inside @@ -135,16 +135,16 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle /** * Default constructor */ - public AddressbookUserLoginWebSessionBean () { + public FinancialsUserLoginWebSessionBean () { try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N + this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N // Also find this - this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup("java:global/addressbook-ejb/userPasswordHistory!org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote"); //NOI18N + this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup("java:global/jfinancials-ejb/userPasswordHistory!org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote"); //NOI18N // Defaul template is guest this.baseTemplatePathName = GUEST_BASE_TEMPLATE_NAME; diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java similarity index 96% rename from src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java index c5da9603..29322a30 100644 --- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/login/FinancialsUserLoginWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.login; +package org.mxchange.jfinancials.beans.login; import java.io.Serializable; import java.util.List; @@ -29,7 +29,7 @@ import org.mxchange.jusercore.model.user.password_history.PasswordHistory; * @author Roland Häder */ @Local -public interface AddressbookUserLoginWebSessionController extends Serializable { +public interface FinancialsUserLoginWebSessionController extends Serializable { /** * Method being call after user's password has been updated (and history diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java index d81b5a1e..e46f6c47 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.mobileprovider; +package org.mxchange.jfinancials.beans.mobileprovider; import java.util.Iterator; import java.util.List; @@ -28,7 +28,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcountry.data.Country; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent; @@ -44,7 +44,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminMobileProviderController") @RequestScoped -public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressbookController implements AddressbookAdminMobileProviderWebRequestController { +public class FinancialsAdminMobileProviderWebRequestBean extends BaseFinancialsController implements FinancialsAdminMobileProviderWebRequestController { /** * Serial number @@ -60,7 +60,7 @@ public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo * Regular bean */ @Inject - private AddressbookMobileProviderWebRequestController mobileController; + private FinancialsMobileProviderWebRequestController mobileController; /** * Event being fired when the mobile provider was added @@ -92,14 +92,14 @@ public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressboo /** * Default constructor */ - public AddressbookAdminMobileProviderWebRequestBean () { + public FinancialsAdminMobileProviderWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup the beans - this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminmobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N + this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminmobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestController.java index 5655b2d4..274ffd60 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsAdminMobileProviderWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.mobileprovider; +package org.mxchange.jfinancials.beans.mobileprovider; import java.io.Serializable; import org.mxchange.jcountry.data.Country; @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Häder */ -public interface AddressbookAdminMobileProviderWebRequestController extends Serializable { +public interface FinancialsAdminMobileProviderWebRequestController extends Serializable { /** * Adds a mobile provider to database by calling the EJB. A pre-check on diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java index 2d3f7d23..d7d145cf 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.mobileprovider; +package org.mxchange.jfinancials.beans.mobileprovider; import java.text.MessageFormat; import java.util.Collections; @@ -27,7 +27,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; @@ -39,7 +39,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe */ @Named ("mobileProviderController") @SessionScoped -public class AddressbookMobileProviderWebRequestBean extends BaseAddressbookController implements AddressbookMobileProviderWebRequestController { +public class FinancialsMobileProviderWebRequestBean extends BaseFinancialsController implements FinancialsMobileProviderWebRequestController { /** * Serial number @@ -59,14 +59,14 @@ public class AddressbookMobileProviderWebRequestBean extends BaseAddressbookCont /** * Default constructor */ - public AddressbookMobileProviderWebRequestBean () { + public FinancialsMobileProviderWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup the beans - this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N + this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestController.java similarity index 91% rename from src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestController.java index edf1854c..81be4343 100644 --- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/mobileprovider/FinancialsMobileProviderWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.mobileprovider; +package org.mxchange.jfinancials.beans.mobileprovider; import java.io.Serializable; import java.util.List; @@ -26,7 +26,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; *

* @author Roland Häder */ -public interface AddressbookMobileProviderWebRequestController extends Serializable { +public interface FinancialsMobileProviderWebRequestController extends Serializable { /** * Returns a list of all mobile providers diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java similarity index 88% rename from src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java index df484bcf..715ea6ea 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.phone; +package org.mxchange.jfinancials.beans.phone; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; @@ -22,7 +22,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote; import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -35,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; */ @Named ("adminPhoneController") @RequestScoped -public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookController implements AddressbookAdminPhoneWebRequestController { +public class FinancialsAdminPhoneWebRequestBean extends BaseFinancialsController implements FinancialsAdminPhoneWebRequestController { /** * Serial number @@ -65,14 +65,14 @@ public class AddressbookAdminPhoneWebRequestBean extends BaseAddressbookControll /** * Default constructor */ - public AddressbookAdminPhoneWebRequestBean () { + public FinancialsAdminPhoneWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup the beans - this.adminPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/addressbook-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + this.adminPhoneBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestController.java similarity index 85% rename from src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestController.java index 7e068bc5..a93da68d 100644 --- a/src/java/org/mxchange/addressbook/beans/phone/AddressbookAdminPhoneWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/phone/FinancialsAdminPhoneWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.phone; +package org.mxchange.jfinancials.beans.phone; import java.io.Serializable; import javax.ejb.Local; @@ -29,19 +29,19 @@ import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; * @author Roland Häder */ @Local -public interface AddressbookAdminPhoneWebRequestController extends Serializable { +public interface FinancialsAdminPhoneWebRequestController extends Serializable { /** - * Setter for dialable cellphone number instance + * Setter for dialable mobile number instance *

- * @param cellPhone Dialable cellphone number instance + * @param cellPhone Dialable mobile number instance */ void setCellPhone (final DialableMobileNumber cellPhone); /** - * Getter for dialable cellphone number instance + * Getter for dialable mobile number instance *

- * @return Dialable cellphone number instance + * @return Dialable mobile number instance */ DialableMobileNumber getMobileNumber (); diff --git a/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java similarity index 85% rename from src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java index deed84dd..23bf1e14 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestBean.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.profile; +package org.mxchange.jfinancials.beans.profile; import java.text.MessageFormat; import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A web request bean for user profiles @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "profileController") @RequestScoped -public class AddressbookUserProfileWebRequestBean extends BaseAddressbookController implements AddressbookUserProfileWebRequestController { +public class FinancialsUserProfileWebRequestBean extends BaseFinancialsController implements FinancialsUserProfileWebRequestController { /** * Serial number @@ -46,13 +46,13 @@ public class AddressbookUserProfileWebRequestBean extends BaseAddressbookControl * Login controller */ @Inject - private AddressbookUserLoginWebSessionController loginController; + private FinancialsUserLoginWebSessionController loginController; /** * User controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; @Override public boolean isProfileLinkVisibleById (final Long userId) { diff --git a/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java index 278371c5..738aefa9 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/profile/FinancialsUserProfileWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.profile; +package org.mxchange.jfinancials.beans.profile; import java.io.Serializable; import org.mxchange.jusercore.model.user.User; @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -public interface AddressbookUserProfileWebRequestController extends Serializable { +public interface FinancialsUserProfileWebRequestController extends Serializable { /** * Checks if the user profile link is visible diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java similarity index 79% rename from src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java rename to src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java index 8292e882..57655b26 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationBean.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.profilemode; +package org.mxchange.jfinancials.beans.profilemode; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; -import org.mxchange.addressbook.beans.BaseAddressbookController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; /** @@ -28,7 +28,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileMode") @ApplicationScoped -public class AddressbookProfileModeWebApplicationBean extends BaseAddressbookController implements AddressbookProfileModeWebApplicationController { +public class FinancialsProfileModeWebApplicationBean extends BaseFinancialsController implements FinancialsProfileModeWebApplicationController { /** * Serial number @@ -38,7 +38,7 @@ public class AddressbookProfileModeWebApplicationBean extends BaseAddressbookCon /** * Default constructor */ - public AddressbookProfileModeWebApplicationBean () { + public FinancialsProfileModeWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java similarity index 88% rename from src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java rename to src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java index 98d690cd..612a8c5d 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java +++ b/src/java/org/mxchange/jfinancials/beans/profilemode/FinancialsProfileModeWebApplicationController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.profilemode; +package org.mxchange.jfinancials.beans.profilemode; import java.io.Serializable; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Häder */ -public interface AddressbookProfileModeWebApplicationController extends Serializable { +public interface FinancialsProfileModeWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java similarity index 88% rename from src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java index 88b302ef..fe3e3a7a 100644 --- a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.register; +package org.mxchange.jfinancials.beans.register; import java.text.MessageFormat; import javax.enterprise.context.SessionScoped; @@ -26,11 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; -import org.mxchange.addressbook.beans.user.AddressbookAdminUserWebRequestController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcoreee.utils.FacesUtils; @@ -43,6 +39,10 @@ import org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController; +import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; +import org.mxchange.jfinancials.beans.user.FinancialsAdminUserWebRequestController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; /** * A web bean for user registration @@ -51,7 +51,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("registerController") @SessionScoped -public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookController implements AddressbookUserRegisterWebSessionController { +public class FinancialsUserRegisterWebSessionBean extends BaseFinancialsController implements FinancialsUserRegisterWebSessionController { /** * Serial number @@ -62,19 +62,19 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro * Administrative user controller */ @Inject - private AddressbookAdminUserWebRequestController adminUserController; + private FinancialsAdminUserWebRequestController adminUserController; /** * Contact controller */ @Inject - private AddressbookContactWebSessionController contactController; + private FinancialsContactWebSessionController contactController; /** * Features controller */ @Inject - private AddressbookFeaturesWebApplicationController featureController; + private FinancialsFeaturesWebApplicationController featureController; /** * Reemote register session bean @@ -92,18 +92,18 @@ public class AddressbookUserRegisterWebSessionBean extends BaseAddressbookContro * User controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Default constructor */ - public AddressbookUserRegisterWebSessionBean () { + public FinancialsUserRegisterWebSessionBean () { try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/addressbook-ejb/register!org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote"); //NOI18N + this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/register!org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionController.java index c6239c63..bdb8fb57 100644 --- a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/register/FinancialsUserRegisterWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.register; +package org.mxchange.jfinancials.beans.register; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface AddressbookUserRegisterWebSessionController extends Serializable { +public interface FinancialsUserRegisterWebSessionController extends Serializable { /** * Registers the user, if not found. Otherwise this method should throw an diff --git a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java similarity index 85% rename from src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java index 21e9e05a..843dbb54 100644 --- a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.resendlink; +package org.mxchange.jfinancials.beans.resendlink; import java.text.MessageFormat; import javax.enterprise.context.SessionScoped; @@ -24,10 +24,10 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.localization.AddressbookLocalizationSessionController; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jcoreee.utils.FacesUtils; +import org.mxchange.jfinancials.beans.BaseFinancialsController; +import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController; +import org.mxchange.jfinancials.beans.user.FinancialsUserWebSessionController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; import org.mxchange.jusercore.exceptions.UserStatusLockedException; @@ -41,7 +41,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("resendController") @SessionScoped -public class AddressbookResendLinkWebSessionBean extends BaseAddressbookController implements AddressbookResendLinkWebSessionController { +public class FinancialsResendLinkWebSessionBean extends BaseFinancialsController implements FinancialsResendLinkWebSessionController { /** * Serial number @@ -62,25 +62,25 @@ public class AddressbookResendLinkWebSessionBean extends BaseAddressbookControll * Localization controller */ @Inject - private AddressbookLocalizationSessionController localizationController; + private FinancialsLocalizationSessionController localizationController; /** * Regular user controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * Default constructor */ - public AddressbookResendLinkWebSessionBean () { + public FinancialsResendLinkWebSessionBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.emailBean = (ResendLinkSessionBeanRemote) context.lookup("java:global/addressbook-ejb/resendLink!org.mxchange.addressbook.beans.resendlink.ResendLinkSessionBeanRemote"); //NOI18N + this.emailBean = (ResendLinkSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/resendLink!org.mxchange.jfinancials.beans.resendlink.ResendLinkSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionController.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionController.java index ffcef87c..3ddcc2eb 100644 --- a/src/java/org/mxchange/addressbook/beans/resendlink/AddressbookResendLinkWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/resendlink/FinancialsResendLinkWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.resendlink; +package org.mxchange.jfinancials.beans.resendlink; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface AddressbookResendLinkWebSessionController extends Serializable { +public interface FinancialsResendLinkWebSessionController extends Serializable { /** * Getter for email address 1 (changing) diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java index a12da1c9..abf69f8b 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user; +package org.mxchange.jfinancials.beans.user; import java.text.MessageFormat; import java.util.Objects; @@ -29,10 +29,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.contact.AddressbookAdminContactWebRequestController; -import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.helper.AddressbookWebRequestController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jusercore.container.login.UserLoginContainer; @@ -57,6 +54,9 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; +import org.mxchange.jfinancials.beans.contact.FinancialsAdminContactWebRequestController; +import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController; +import org.mxchange.jfinancials.beans.helper.FinancialsWebRequestController; /** * A user bean (controller) @@ -65,7 +65,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("adminUserController") @RequestScoped -public class AddressbookAdminUserWebRequestBean extends BaseAddressbookController implements AddressbookAdminUserWebRequestController { +public class FinancialsAdminUserWebRequestBean extends BaseFinancialsController implements FinancialsAdminUserWebRequestController { /** * Serial number @@ -83,7 +83,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle * Regular contact controller */ @Inject - private AddressbookAdminContactWebRequestController adminContactController; + private FinancialsAdminContactWebRequestController adminContactController; /** * Administrative user EJB @@ -94,13 +94,13 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle * Admin helper instance */ @Inject - private AddressbookWebRequestController beanHelper; + private FinancialsWebRequestController beanHelper; /** * Regular contact controller */ @Inject - private AddressbookContactWebSessionController contactController; + private FinancialsContactWebSessionController contactController; /** * An event fired when the administrator has updated a new user @@ -118,7 +118,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle * Regular user controller */ @Inject - private AddressbookUserWebSessionController userController; + private FinancialsUserWebSessionController userController; /** * An event fired when the administrator has linked a user with existing @@ -156,15 +156,15 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle /** * Default constructor */ - public AddressbookAdminUserWebRequestBean () { + public FinancialsAdminUserWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N - this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.adminUserBean = (AdminUserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -251,7 +251,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle throw new FaceletException(new EmailAddressAlreadyRegisteredException(user)); } else if ((this.getUserPassword() == null && (this.getUserPasswordRepeat() == null)) || ((this.getUserPassword().isEmpty()) && (this.getUserPasswordRepeat().isEmpty()))) { // Empty password entered, then generate one - password = UserUtils.createRandomPassword(AddressbookUserWebSessionController.MINIMUM_PASSWORD_LENGTH); + password = UserUtils.createRandomPassword(FinancialsUserWebSessionController.MINIMUM_PASSWORD_LENGTH); } else if (!this.isSamePasswordEntered()) { // Both passwords don't match throw new FaceletException(new UserPasswordRepeatMismatchException(user)); @@ -262,7 +262,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookControlle // The password should not be null and at least 5 characters long assert (password != null) : "password is null"; //NOI18N - assert (password.length() >= AddressbookUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N + assert (password.length() >= FinancialsUserWebSessionController.MINIMUM_PASSWORD_LENGTH) : "Password is not long enough."; //NOI18N // Encrypt password and set it user.setUserEncryptedPassword(UserUtils.encryptPassword(password)); diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java similarity index 96% rename from src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java index 10dad2ed..ec51974c 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsAdminUserWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user; +package org.mxchange.jfinancials.beans.user; import java.io.Serializable; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; @@ -25,7 +25,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Häder */ -public interface AddressbookAdminUserWebRequestController extends Serializable { +public interface FinancialsAdminUserWebRequestController extends Serializable { /** * Event observer for new user registrations diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java similarity index 96% rename from src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java rename to src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java index 26da5734..26383bec 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user; +package org.mxchange.jfinancials.beans.user; import java.text.MessageFormat; import java.util.Iterator; @@ -32,11 +32,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.contact.AddressbookContactWebSessionController; -import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; -import org.mxchange.addressbook.beans.localization.AddressbookLocalizationSessionController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.ContactSessionBeanRemote; import org.mxchange.jusercore.events.confirmation.UserConfirmedAccountEvent; @@ -55,6 +51,10 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; +import org.mxchange.jfinancials.beans.contact.FinancialsContactWebSessionController; +import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; +import org.mxchange.jfinancials.beans.localization.FinancialsLocalizationSessionController; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; /** * A user bean (controller) @@ -63,7 +63,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("userController") @SessionScoped -public class AddressbookUserWebSessionBean extends BaseAddressbookController implements AddressbookUserWebSessionController { +public class FinancialsUserWebSessionBean extends BaseFinancialsController implements FinancialsUserWebSessionController { /** * Serial number @@ -79,19 +79,19 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp * General contact controller */ @Inject - private AddressbookContactWebSessionController contactController; + private FinancialsContactWebSessionController contactController; /** * Features controller */ @Inject - private AddressbookFeaturesWebApplicationController featureController; + private FinancialsFeaturesWebApplicationController featureController; /** * Localization controller */ @Inject - private AddressbookLocalizationSessionController localizationController; + private FinancialsLocalizationSessionController localizationController; /** * Event being fired when user updated personal data @@ -119,7 +119,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp * Login bean (controller) */ @Inject - private AddressbookUserLoginWebSessionController userLoginController; + private FinancialsUserLoginWebSessionController userLoginController; /** * User name @@ -157,17 +157,17 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp /** * Default constructor */ - public AddressbookUserWebSessionBean () { + public FinancialsUserWebSessionBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); @@ -422,7 +422,7 @@ public class AddressbookUserWebSessionBean extends BaseAddressbookController imp this.setUserProfileMode(ProfileMode.INVISIBLE); // Generate random password - String randomPassword = UserUtils.createRandomPassword(AddressbookUserWebSessionController.MINIMUM_PASSWORD_LENGTH); + String randomPassword = UserUtils.createRandomPassword(FinancialsUserWebSessionController.MINIMUM_PASSWORD_LENGTH); // Set random password this.setUserPassword(randomPassword); diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java rename to src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java index 56431b5b..e6933d36 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java +++ b/src/java/org/mxchange/jfinancials/beans/user/FinancialsUserWebSessionController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user; +package org.mxchange.jfinancials.beans.user; import java.io.Serializable; import java.util.List; @@ -36,7 +36,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Häder */ -public interface AddressbookUserWebSessionController extends Serializable { +public interface FinancialsUserWebSessionController extends Serializable { /** * Minimum password length diff --git a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java similarity index 91% rename from src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java rename to src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java index 27b4becf..36b9f634 100644 --- a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestBean.java +++ b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user.password; +package org.mxchange.jfinancials.beans.user.password; import java.util.Objects; import javax.enterprise.context.RequestScoped; @@ -26,9 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.BaseAddressbookController; -import org.mxchange.addressbook.beans.features.AddressbookFeaturesWebApplicationController; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.BaseFinancialsController; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jusercore.events.user.password_change.UpdatedUserPasswordEvent; import org.mxchange.jusercore.events.user.password_change.UserUpdatedPasswordEvent; @@ -40,6 +38,8 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.password_history.PasswordHistory; +import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; /** * A user password (change) bean (controller) @@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.password_history.PasswordHistory; */ @Named ("userPasswordController") @RequestScoped -public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookController implements AddressbookUserPasswordWebRequestController { +public class FinancialsUserPasswordWebRequestBean extends BaseFinancialsController implements FinancialsUserPasswordWebRequestController { /** * Serial number @@ -59,7 +59,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro * Features controller */ @Inject - private AddressbookFeaturesWebApplicationController featureController; + private FinancialsFeaturesWebApplicationController featureController; /** * Remote user bean @@ -75,7 +75,7 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro * Login bean (controller) */ @Inject - private AddressbookUserLoginWebSessionController userLoginController; + private FinancialsUserLoginWebSessionController userLoginController; /** * User password (unencrypted from web form) @@ -97,14 +97,14 @@ public class AddressbookUserPasswordWebRequestBean extends BaseAddressbookContro /** * Default constructor */ - public AddressbookUserPasswordWebRequestBean () { + public FinancialsUserPasswordWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestController.java b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestController.java rename to src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestController.java index b53e7d99..9241dae6 100644 --- a/src/java/org/mxchange/addressbook/beans/user/password/AddressbookUserPasswordWebRequestController.java +++ b/src/java/org/mxchange/jfinancials/beans/user/password/FinancialsUserPasswordWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.user.password; +package org.mxchange.jfinancials.beans.user.password; import java.io.Serializable; import javax.ejb.Local; @@ -25,7 +25,7 @@ import javax.ejb.Local; * @author Roland Häder */ @Local -public interface AddressbookUserPasswordWebRequestController extends Serializable { +public interface FinancialsUserPasswordWebRequestController extends Serializable { /** * Getter for unencrypted user password diff --git a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java b/src/java/org/mxchange/jfinancials/converter/contact/AddressbookContactConverter.java similarity index 97% rename from src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java rename to src/java/org/mxchange/jfinancials/converter/contact/AddressbookContactConverter.java index ca8c1219..51c2d25d 100644 --- a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/contact/AddressbookContactConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.contact; +package org.mxchange.jfinancials.converter.contact; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -63,7 +63,7 @@ public class AddressbookContactConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and user controller - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java b/src/java/org/mxchange/jfinancials/converter/country/AddressbookCountryConverter.java similarity index 97% rename from src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java rename to src/java/org/mxchange/jfinancials/converter/country/AddressbookCountryConverter.java index d339c1ad..2b86ba01 100644 --- a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/country/AddressbookCountryConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.country; +package org.mxchange.jfinancials.converter.country; import java.text.MessageFormat; import java.util.List; @@ -63,7 +63,7 @@ public class AddressbookCountryConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and country bean - this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N + this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/converter/cellphone/AddressbookCellphoneConverter.java b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileConverter.java similarity index 86% rename from src/java/org/mxchange/addressbook/converter/cellphone/AddressbookCellphoneConverter.java rename to src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileConverter.java index 4b23ffcf..90201b31 100644 --- a/src/java/org/mxchange/addressbook/converter/cellphone/AddressbookCellphoneConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/mobile/FinancialsMobileConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.cellphone; +package org.mxchange.jfinancials.converter.mobile; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -33,12 +33,12 @@ import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote; /** - * Converter for cellphone id <-> valid cellphone instance + * Converter for mobile id <-> valid mobile instance *

* @author Roland Häder */ -@FacesConverter (value = "CellphoneConverter") -public class AddressbookCellphoneConverter implements Converter { +@FacesConverter (value = "MobileConverter") +public class FinancialsMobileConverter implements Converter { /** * Logger instance @@ -54,7 +54,7 @@ public class AddressbookCellphoneConverter implements Converter { /** * Initialization of this converter */ - public AddressbookCellphoneConverter () { + public FinancialsMobileConverter () { // Try to get it try { // Get initial context @@ -64,7 +64,7 @@ public class AddressbookCellphoneConverter implements Converter { 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/addressbook-ejb/phone!org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote"); //NOI18N + 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 @@ -86,20 +86,20 @@ public class AddressbookCellphoneConverter implements Converter { } // Init instance - DialableMobileNumber cellphone = null; + DialableMobileNumber mobile = null; try { // Try to parse the value as long - Long cellphoneId = Long.valueOf(submittedValue); + Long mobileId = Long.valueOf(submittedValue); // Debug message // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: userId{0}", userId)); //NOI18N - // Try to get cellphone instance from it - cellphone = this.phoneBean.findMobileNumberById(cellphoneId); + // Try to get mobile instance from it + mobile = this.phoneBean.findMobileNumberById(mobileId); // Debug message - // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: cellphone={0}", cellphone)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logDebug(MessageFormat.format("getAsObject: mobile={0}", mobile)); //NOI18N } catch (final NumberFormatException ex) { // Throw again throw new ConverterException(ex); @@ -109,10 +109,10 @@ public class AddressbookCellphoneConverter implements Converter { } // Trace message - // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: cellphone={0} - EXIT!", cellphone)); //NOI18N + // NOISY-DEBUG: this.loggerBeanLocal.logTrace(MessageFormat.format("getAsObject: mobile={0} - EXIT!", mobile)); //NOI18N // Return it - return cellphone; + return mobile; } @Override diff --git a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java similarity index 95% rename from src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java rename to src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java index bd317655..1b555568 100644 --- a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/mobileprovider/FinancialsMobileProviderConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.mobileprovider; +package org.mxchange.jfinancials.converter.mobileprovider; import java.text.MessageFormat; import java.util.List; @@ -37,7 +37,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe * @author Roland Häder */ @FacesConverter (value = "MobileProviderConverter") -public class AddressbookMobileProviderConverter implements Converter { +public class FinancialsMobileProviderConverter implements Converter { /** * Logger instance @@ -53,7 +53,7 @@ public class AddressbookMobileProviderConverter implements Converter { /** * Initialization of this converter */ - public AddressbookMobileProviderConverter () { + public FinancialsMobileProviderConverter () { // Try to get it try { // Get initial context @@ -63,7 +63,7 @@ public class AddressbookMobileProviderConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N /// and mobile provider controller - this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.MobileProvider.MobileProviderSingletonBeanRemote"); //NOI18N + this.mobileRemoteBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/jfinancials-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.MobileProvider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java similarity index 95% rename from src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java rename to src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java index 3dc59447..9a079ee2 100644 --- a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java +++ b/src/java/org/mxchange/jfinancials/converter/user/FinancialsUserConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.user; +package org.mxchange.jfinancials.converter.user; import java.text.MessageFormat; import javax.faces.component.UIComponent; @@ -37,7 +37,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; * @author Roland Häder */ @FacesConverter (value = "UserConverter") -public class AddressbookUserConverter implements Converter { +public class FinancialsUserConverter implements Converter { /** * Logger instance @@ -53,7 +53,7 @@ public class AddressbookUserConverter implements Converter { /** * Initialization of this converter */ - public AddressbookUserConverter () { + public FinancialsUserConverter () { // Try to get it try { // Get initial context @@ -63,7 +63,7 @@ public class AddressbookUserConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and user controller - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java b/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java similarity index 93% rename from src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java rename to src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java index c5d19937..ed88aadd 100644 --- a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/birthday/FinancialsBirthdayValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.validator.birthday; +package org.mxchange.jfinancials.validator.birthday; import java.text.MessageFormat; import java.util.Date; @@ -36,7 +36,7 @@ import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; * @author Roland Häder */ @FacesValidator("BirthdayValidator") -public class AddressbookBirthdayValidator extends BaseDateValidator implements Validator { +public class FinancialsBirthdayValidator extends BaseDateValidator implements Validator { /** * Serial number @@ -52,7 +52,7 @@ public class AddressbookBirthdayValidator extends BaseDateValidator implements V /** * Default constructor */ - public AddressbookBirthdayValidator () { + public FinancialsBirthdayValidator () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java similarity index 94% rename from src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java rename to src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java index b04b53b0..b7e43cd5 100644 --- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/emailaddress/FinancialsEmailAddressValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.validator.emailaddress; +package org.mxchange.jfinancials.validator.emailaddress; import java.text.MessageFormat; import java.util.regex.Pattern; @@ -37,7 +37,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator; * @author Roland Häder */ @FacesValidator ("EmailAddressValidator") -public class AddressbookEmailAddressValidator extends BaseStringValidator implements Validator { +public class FinancialsEmailAddressValidator extends BaseStringValidator implements Validator { /** * Serial number @@ -52,14 +52,14 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem /** * Default constructor */ - public AddressbookEmailAddressValidator () { + public FinancialsEmailAddressValidator () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup - this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/addressbook-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N + this.contactBean = (ContactSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/contact!org.mxchange.jcontacts.contact.ContactSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java b/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java similarity index 89% rename from src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java rename to src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java index 3f58d958..dc1a130a 100644 --- a/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/password/FinancialsUserPasswordValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.validator.password; +package org.mxchange.jfinancials.validator.password; import javax.faces.application.FacesMessage; import javax.faces.component.UIComponent; @@ -27,7 +27,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.model.user.UserUtils; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.jfinancials.beans.login.FinancialsUserLoginWebSessionController; /** * A validator for validating passwords (if they match with stored) @@ -35,7 +35,7 @@ import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionContro * @author Roland Häder */ @FacesValidator (value = "UserPasswordValidator") -public class AddressbookUserPasswordValidator extends BaseStringValidator implements Validator { +public class FinancialsUserPasswordValidator extends BaseStringValidator implements Validator { /** * Serial number @@ -46,7 +46,7 @@ public class AddressbookUserPasswordValidator extends BaseStringValidator implem * User login controller */ @Inject - private AddressbookUserLoginWebSessionController loginController; + private FinancialsUserLoginWebSessionController loginController; @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { diff --git a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java similarity index 92% rename from src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java rename to src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java index 5530222d..8a9d4fc2 100644 --- a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java +++ b/src/java/org/mxchange/jfinancials/validator/user/FinancialsUserIdValidator.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.validator.user; +package org.mxchange.jfinancials.validator.user; import java.text.MessageFormat; import java.util.Set; @@ -42,7 +42,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote; * @author Roland Häder */ @FacesValidator (value = "UserIdValidator") -public class AddressbookUserIdValidator extends BaseLongValidator implements Validator { +public class FinancialsUserIdValidator extends BaseLongValidator implements Validator { /** * Cached user status @@ -68,7 +68,7 @@ public class AddressbookUserIdValidator extends BaseLongValidator implements Val /** * Initialization of this converter */ - public AddressbookUserIdValidator () { + public FinancialsUserIdValidator () { // Try to get it try { // Get initial context @@ -78,7 +78,7 @@ public class AddressbookUserIdValidator extends BaseLongValidator implements Val this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and user controller - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N @@ -116,7 +116,7 @@ public class AddressbookUserIdValidator extends BaseLongValidator implements Val this.loggerBeanLocal.logDebug(MessageFormat.format("UserIdValidator:afterRegistrationEvent: registeredUser={0}", registeredUser)); //NOI18N // Update cache - AddressbookUserIdValidator.cachedStatus.add(registeredUser.getUserId()); + FinancialsUserIdValidator.cachedStatus.add(registeredUser.getUserId()); // Trace message this.loggerBeanLocal.logTrace("UserIdValidator:afterRegistrationEvent: EXIT!"); //NOI18N @@ -140,7 +140,7 @@ public class AddressbookUserIdValidator extends BaseLongValidator implements Val Boolean ifUserExists; // Is a map entry there? - if (AddressbookUserIdValidator.cachedStatus.contains(userId)) { + if (FinancialsUserIdValidator.cachedStatus.contains(userId)) { // Get from cache ifUserExists = Boolean.TRUE; } else { @@ -155,7 +155,7 @@ public class AddressbookUserIdValidator extends BaseLongValidator implements Val } // Add to cache if valid - AddressbookUserIdValidator.cachedStatus.add(userId); + FinancialsUserIdValidator.cachedStatus.add(userId); // Trace message this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index e904fa58..edbb1c9c 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -128,32 +128,8 @@ LINK_LOGIN_LOGOUT=Ausloggen COUNTRY_GERMANY=Deutschland COUNTRY_PHILIPPINES=Philippinen NONE_SELECTED=k.A. -ADDRESSBOOK_ID=Id-Nummer: -ADDRESSBOOK_ID_TITLE=Identifizierende, eindeutige Nummer -ADDRESSBOOK_NAME=Addressbuchname: -ADDRESSBOOK_NAME_TITLE=Name des Adressbuches -ADDRESSBOOK_CREATED=Erstellt: -ADDRESSBOOK_CREATED_TITLE=Wann das Adressbuch erstellt wurde. -LINK_SHOW_ADDRESSBOOK_TITLE=Adressbuch anzeigen -PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Adressbuch anzeigen -CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Anzeigen des ausgew\u00e4hlten Adressbuchs: -ADDRESSBOOK_TOTAL_ENTRIES=Eintr\u00e4ge: -PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Adressbucheintr\u00e4ge zeigen -CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Alle Adressbuchentr\u00e4ge anzeigen: -ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Eintr\u00e4ge im Adressbuch -PARAMETER_ADDRESSBOOK_ID_MISSING=Bitte diese Seite mit Id-Nummer aufrufen. -PARAMETER_ADDRESSBOOK_ID_INVALID=Id-Nummer f\u00fcr Adressbuch ung\u00fcltig. Bitte links weiter navigieren. ENTERED_HOUSE_NUMBER_INVALID=Die eingegebene Hausnummer ist ung\u00fcltig. ENTERED_ZIP_CODE_INVALID=Die eingegebene Postleitzahl ist ung\u00fcltig. -PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=Der angeklickte Link ist nicht mehr g\u00fcltig: Adressbuch mit der Id-Nummer nicht gefunden. -LINK_LOGIN_SHARED_ADDRESS_BOOKS=Mit anderen geteilt -LINK_LOGIN_SHARED_ADDRESS_BOOKS_TITLE=Mit anderen Benutzern geteilte Adressb\u00fccher -PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Mit anderen geteilte Adressb\u00fccher -CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Meine mit anderen Benutzern geteilte Adressb\u00fccher: -LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Jetzt Ihre Adressb\u00fccher mit anderen Mitgliedern teilen! -LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=Meine mit anderen Benutzern geteilte Adressb\u00fccher -TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=Diese Tabelle listed alle von Ihnen mit anderen Benutzern geteilte Adressb\u00fccher auf. -LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Derzeit teilen Sie keine Adressb\u00fccher mit anderen Benutzern. TABLE_HEADER_USER_LIST=Alle Benutzer auflisten TABLE_SUMMARY_USER_LIST=Diese Tabelle listet alle registrierten Benutzer aus, mit denen Sie Ihre Adressb\u00fccher teilen k\u00f6nnen. USER_PROFILE_LEGEND=\u00d6ffentlich einsehbares Profil: @@ -166,43 +142,14 @@ USER_ID=Benutzernummer: USER_NAME=Benutzername: USER_CREATED=Beigetreten: USER_CREATED_TITLE=Wann der Benutzer dieser Community beigetreten ist. -USER_LIST_SHARING_ADDRESSBOOKS=Freigegebene Adressb\u00fccher: -LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS=Auflisten -LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE=Listet alle mit dem Benutzer geteilte Adressb\u00fccher auf. PAGE_TITLE_INDEX_USER_PROFILE=Benutzerprofil CONTENT_TITLE_INDEX_USER_PROFILE=\u00d6ffentliches Profil des Benutzers: -PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=Mit einem Benutzer geteilte Adressb\u00fccher -CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=Mit einem Benutzer geteilte Adressb\u00fccher auflisten: PARAMETER_USER_ID_MISSING=Benutzernummer nicht angegeben. PARAMETER_USER_ID_INVALID=Der angeklickte Link ist nicht mehr g\u00fcltig: Den Benutzer mit der Id-Nummer existiert nicht (mehr). PARAMETER_USER_ID_NOT_FOUND=Benutzeraccount mit der Id-Nummer nicht gefunden. TABLE_HEADER_ERROR_HANDLING_USER_ID=Fehler beim Verarbeiten der Benutzernummer: -TABLE_HEADER_SHOW_ADDRESSBOOK=Adressbuchdaten: -LINK_LOGIN_START_SHARING_ADDRESSBOOK=Mit jemandem dieses Adressbuch teilen -LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE=Dieses Adresssbuch k\u00f6nnen Sie mit einem anderen Benutzer teilen. Dadurch kann er Ihre Kontakte sehen. -PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Das Adressbuch mit anderen Benutzern teilen -CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Teilen Sie dieses Adressbuch mit anderen Benutzern: -LOGIN_START_SHARING_TITLE=Teilen -LOGIN_START_SHARING_BUTTON=Mit diesem Benutzer teilen -LOGIN_START_SHARING_BUTTON_TITLE=Teilen Sie Ihr ausgew\u00e4hltes Adressbuch mit diesem Benutzer. -TABLE_HEADER_CHOOSE_USER_FOR_SHARING=W\u00e4hlen Sie einen Benutzer zum Teilen Ihres Adressbuches aus. -LOGIN_START_SHARING_NOTICE1=Damit werden Ihr gesamtes Adressbuch fuer den ausgewaehlten Benutzer sichtbar. -LOGIN_START_SHARING_NOTICE2=Sie k\u00f6nnen dies jederzeit wiederrufen. LINK_USER_PROFILE=Zum Benutzerprofil LINK_USER_PROFILE_TITLE=Das Benutzerprofil in einem neuen Fenster aufrufen. -LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE=Teilen Sie Ihre Adressb\u00fccher mit anderen Benutzern. Sie k\u00f6nnen den Schritt jederzeit zur\u00fccknehmen. -ADDRESSBOOK_STATUS_UNLOCKED=Freigegeben -ADDRESSBOOK_STATUS_LOCKED=Gesperrt -ADDRESSBOOK_STATUS_TITLE=Status des Adressbuches -SHARED_ADDRESSBOOK=Adressbuch: -SHAREE_USER_NAME=Geteilt mit: -SHARE_CREATED=Wann gestartet: -SHARE_CREATED_TITLE=Wann die Freigabe erfolgte -SHARED_ADDRESSBOOK_TITLE=Welches Adressbuch freigegeben wurde -SHAREE_USER_NAME_TITLE=Mit wem Sie Ihr Adressbuch teilen -ADDRESSBOOK_OWNER=Besitzer: -ADDRESSBOOK_STATUS=Status: -PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK=\u00d6ffentlicher Teil des Adressbuchs anzeigen USER_PROFILE_NOT_PUBLICLY_VISIBLE=Das Benutzerprofil ist privat. PAGE_TITLE_LOGIN_USER_PROFILE=Benutzerprofil ansehen PUBLIC_USER_PROFILE=\u00d6ffentliches Benutzerprofil @@ -214,7 +161,6 @@ LOGIN_NO_USER_NAME_MESSAGE=Sie haben keinen Benutzernamen eingegeben. USER_NOT_LOGGED_IN=Sie sind nicht angemeldet. LOGIN_OWN_PROFILE_INVISIBLE=Ihr Profil ist auf "durchsichtig" gestellt. ERROR_USER_INSTANCE_NOT_SET=Fehler: Benutzer-Instanz nicht gesetzt. -LOGIN_ADDRESSBOOK_NOT_SET=Fehler: Adressbuch-Instanz nicht gesetzt. LINK_GUEST_LOGIN_LOST_PASSWORD=Passwort vergessen? LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Passwort wiederherstellen TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=Sie m\u00fcssen angemeldet sein @@ -223,8 +169,6 @@ LOGIN_EDIT_USER_DATA_TITLE=Was m\u00f6chten Sie \u00e4ndern? LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE=Sie k\u00f6nnen hier Ihre pers\u00f6nlichen Daten, Ihre Email-Adresse und Ihr Passwort zum Einloggen \u00e4ndern. LINK_LOGIN_CHANGE_PERSONAL_DATA=Pers\u00f6nliche Daten, wie Anschrift usw. \u00e4ndern LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE=\u00c4ndern Sie hier Ihre pers\u00f6nlichen Daten, wie Anschrift, Telefonnummer und so weiter. -LINK_LOGIN_CHANGE_EMAIL_ADDRESS=Ihre Email-Adresse \u00e4ndern -LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie hier Ihre Email-Adresse. Dies ben\u00f6tigt eine weitere Best\u00e4tigung und kann jederzeit zur\u00fcckgaengig gemacht werden. LINK_LOGIN_CHANGE_PASSWORD=Ihr Passwort \u00e4ndern LINK_LOGIN_CHANGE_PASSWORD_TITLE=\u00c4ndern Sie hier Ihr Passwort, falls Sie ein anderes m\u00f6chten. LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND=Bitte derzeitiges Passwort zur Best\u00e4tigung eingeben: @@ -240,10 +184,8 @@ MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY=Fehler: Parameter "message" nicht gesetzt. LOGIN_MESSAGE_DATA_SAVED=Daten wurden gespeichert. PAGE_TITLE_LOGIN_DATA_SAVED=Ihre Daten wurden gespeichert CONTENT_TITLE_LOGIN_DATA_SAVED=Daten wurden gespeichert: -LOGIN_CHANGE_EMAIL_ADDRESS_TITLE=\u00c4ndern Sie Ihre Email-Adresse: LOGIN_CHANGE_EMAIL_LEGEND=Email-Adresse \u00e4ndern: LOGIN_CHANGE_EMAIL_LEGEND_TITLE=Hier k\u00f6nnen Sie Ihre Email-Adresse \u00e4ndern. Dazu m\u00fcssen Sie diese zweimal eingeben und die neue Adresse best\u00e4tigen. -LOGIN_CHANGE_EMAIL_OLD_ADDRESS=Ihre derzeitige Email-Adresse: LOGIN_CHANGE_EMAIL_ENTER_EMAIL=Neue Email-Adresse eingeben: LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT=Neue Email-Adresse wiederholen: BUTTON_CHANGE_EMAIL_ADDRESS=Email-Adresse \u00e4ndern @@ -486,7 +428,7 @@ ADMIN_LINK_SHOW_CONTACT_TITLE=Kontaktdaten anzeigen ADMIN_MENU_CONTACT_TITLE=Kontaktdaten LINK_ADMIN_LIST_CONTACT=Kontaktdaten auflisten LINK_ADMIN_LIST_CONTACT_TITLE=Listet alle Kontaktdaten auf, egal wo her sie angelegt wurden. -ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'cellphoneNumber' und 'contact' nicht gesetzt. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Fehler: Parameter 'mobileNumber' und 'contact' nicht gesetzt. ADMIN_ADD_CONTACT_MINIMUM_DATA=Bitte geben Sie mindestens Anrede, Vorname und Nachname an. ERROR_PARAMETER_CONTACT_NOT_SET=Fehler: Parameter 'contact' nicht gesetzt. ADMIN_HEADER_SHOW_CONTACT=Kontaktdaten f\u00fcr {0}: diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 4a12d5e0..c6c68ea1 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -129,32 +129,8 @@ PAGE_TITLE_LOGIN_AREA=User area COUNTRY_GERMANY=Germany COUNTRY_PHILIPPINES=Philippines NONE_SELECTED=Empty -ADDRESSBOOK_ID=Id number: -ADDRESSBOOK_ID_TITLE=Identifying unique number -ADDRESSBOOK_NAME=Address book name: -ADDRESSBOOK_NAME_TITLE=Name of the address book -ADDRESSBOOK_CREATED=Created: -ADDRESSBOOK_CREATED_TITLE=When the address book was created. -LINK_SHOW_ADDRESSBOOK_TITLE=Show address book -PAGE_TITLE_USER_SHOW_ADDRESSBOOK=Show address book -CONTENT_TITLE_USER_SHOW_ADDRESSBOOK=Show selected address book: -ADDRESSBOOK_TOTAL_ENTRIES=Entries: -PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show address book entries -CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES=Show all address book entries: -ADDRESSBOOK_TOTAL_ENTRIES_TITLE=Entries in address book -PARAMETER_ADDRESSBOOK_ID_MISSING=Please call this web page with id number. -PARAMETER_ADDRESSBOOK_ID_INVALID=Id number for address book invalid. Please continue navigating on left menu. ENTERED_HOUSE_NUMBER_INVALID=The entered house number is invalid. ENTERED_ZIP_CODE_INVALID=The entered ZIP code is invalid. -PARAMETER_ADDRESSBOOK_ID_NOT_FOUND=The clicked link is no longer valid: Address book with entered id number does not exist (anymore). -LINK_LOGIN_SHARED_ADDRESS_BOOKS=Shared with others -LINK_LOGIN_SHARED_ADDRESS_BOOKS_TITLE=With other users shared address books -PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS=With others shared address books -CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS=Mine with other users shared address books: -LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Start now sharing your address books with other users! -LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=My with other users shared address books -TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=This table lists all your with other users shared address books. -LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Currently you don't share any address books with other users. TABLE_HEADER_USER_LIST=List all users TABLE_SUMMARY_USER_LIST=This table lists all registered users you can share your address books with. USER_PROFILE_LEGEND=Publicly visible profile: @@ -167,43 +143,14 @@ USER_ID=User id: USER_NAME=User name: USER_CREATED=Joined: USER_CREATED_TITLE=When the user has joined this community. -USER_LIST_SHARING_ADDRESSBOOKS=Shared address books: -LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS=List -LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE=Lists all with this user shared address books. PAGE_TITLE_INDEX_USER_PROFILE=User profile CONTENT_TITLE_INDEX_USER_PROFILE=Public profile of the user: -PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=With a user shared address books -CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS=List with a user shared address books: PARAMETER_USER_ID_MISSING=No user id number provided PARAMETER_USER_ID_INVALID=The clicked link is no longer valid: The user with provided id number does not exist (anymore). PARAMETER_USER_ID_NOT_FOUND=User account with given id number not found. TABLE_HEADER_ERROR_HANDLING_USER_ID=Error while handling user id: -TABLE_HEADER_SHOW_ADDRESSBOOK=Address book data: -LINK_LOGIN_START_SHARING_ADDRESSBOOK=Start sharing this address book with another user -LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE=You can start sharing this address book with anther user. Then he cann see your contacts. -PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Share the address book with other users -CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Start sharing this address book with other users: -LOGIN_START_SHARING_TITLE=Share -LOGIN_START_SHARING_BUTTON=Share with this user -LOGIN_START_SHARING_BUTTON_TITLE=Share your choosen address book with this user. -TABLE_HEADER_CHOOSE_USER_FOR_SHARING=Choose a user for sharing your address book with. -LOGIN_START_SHARING_NOTICE1=With this your whole address book becomes visible to the other user. -LOGIN_START_SHARING_NOTICE2=You can always revoke your choice. LINK_USER_PROFILE=To user profile LINK_USER_PROFILE_TITLE=Open the user profile in a new window. -LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE=Start sharing your address books with other users. You can always revoke your decission. -ADDRESSBOOK_STATUS_UNLOCKED=Unlocked -ADDRESSBOOK_STATUS_LOCKED=Locked -ADDRESSBOOK_STATUS_TITLE=Status of the address book -SHARED_ADDRESSBOOK=Address book: -SHAREE_USER_NAME=Shared with: -SHARE_CREATED=Started: -SHARE_CREATED_TITLE=When the sharing has started. -SHARED_ADDRESSBOOK_TITLE=Which address book is being shared -SHAREE_USER_NAME_TITLE=With who you shared your address book -ADDRESSBOOK_OWNER=Owner: -ADDRESSBOOK_STATUS=Status: -PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK=Show public part of address book USER_PROFILE_NOT_PUBLICLY_VISIBLE=The user profile is private. PAGE_TITLE_LOGIN_USER_PROFILE=View user profile PUBLIC_USER_PROFILE=Public user profile @@ -217,7 +164,6 @@ LOGIN_NO_PASSWORD_MESSAGE=You have entered no password. LOGIN_NO_USER_NAME_MESSAGE=You have entered no user name. USER_NOT_LOGGED_IN=You are not signed in. LOGIN_OWN_PROFILE_INVISIBLE=Your profile is set to "invisible". -LOGIN_ADDRESSBOOK_NOT_SET=Error: Address book instance not set. LINK_GUEST_LOGIN_LOST_PASSWORD=Forgot your password? LINK_TITLE_GUEST_LOGIN_LOST_PASSWORD=Restore your password TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN=You need to be logged-in @@ -419,21 +365,21 @@ ADMIN_LINK_DELETE_SHORT=Delete ADMIN_LINK_DELETE_SHORT_TITLE=Delete entry. ADMIN_LINK_UNLINK_SHORT=Unlink ADMIN_LINK_UNLINK_SHORT_TITLE=Removes link to entry. -PAGE_TITLE_ADMIN_DELETE_CELLPHONE=Delete contact's cellphone entry -CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Delete contact's cellphone entry: -PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's cellphone entry -CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's cellphone entry: -PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List all cellphone entries -PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's cellphone entry -CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's cellphone entry: -PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link contact-cellphone -CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link between contact-cellphone: +PAGE_TITLE_ADMIN_DELETE_CELLPHONE=Delete contact's mobile entry +CONTENT_TITLE_ADMIN_DELETE_CELLPHONE=Delete contact's mobile entry: +PAGE_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's mobile entry +CONTENT_TITLE_ADMIN_EDIT_CELLPHONE=Edit contact's mobile entry: +PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE=List all mobile entries +PAGE_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's mobile entry +CONTENT_TITLE_ADMIN_SHOW_CELLPHONE=Show contact's mobile entry: +PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link contact-mobile +CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE=Remove link between contact-mobile: ERROR_PARAMETER_PHONE_ID_NOT_SET=Error: Parameter 'phoneId' is not set. PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER=Show mobile provider: -TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=A single contact's cellphone entry. -TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=This table shows links of of this cellphone number to all contacts. -ADMIN_HEADER_SHOW_CELLPHONE_LINKS=All links between contact-cellphone for id {0}: +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE=A single contact's mobile entry. +TABLE_SUMMARY_ADMIN_SHOW_CELLPHONE_LINKS=This table shows links of of this mobile number to all contacts. +ADMIN_HEADER_SHOW_CELLPHONE_LINKS=All links between contact-mobile for id {0}: ERROR_PARAMETER_CONTACT_ID_NOT_SET=Error: Parameter 'contactId' is not set. ADMIN_SHOW_CELLPHONE_UNLINK=Unlink: ADMIN_CONTACT_ID=Contact id: @@ -465,7 +411,7 @@ ADMIN_LINK_SHOW_CONTACT_TITLE=Show contact data ADMIN_MENU_CONTACT_TITLE=Manage contact data LINK_ADMIN_LIST_CONTACT=List contact data LINK_ADMIN_LIST_CONTACT_TITLE=Lists all contact data regardless where they was created. -ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'cellphoneNumber' and 'contact' are not set. +ERROR_PARAMETER_CELLPHONE_NUMBER_CONTACT_NOT_SET=Error: Parameter 'mobileNumber' and 'contact' are not set. ADMIN_ADD_CONTACT_MINIMUM_DATA=Please enter at least salutation, first name and family name. ERROR_PARAMETER_CONTACT_NOT_SET=Error: Parameter 'contact' is not set. ADMIN_HEADER_SHOW_CONTACT=Contact data for {0}: diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 90f02c23..d9026de2 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -111,8 +111,8 @@ /admin/mobile_provider/admin_mobile_provider_list.xhtml - admin_list_contact_cellphone - /admin/cellphone/admin_contact_cellphone_list.xhtml + admin_list_contact_mobile + /admin/mobile/admin_contact_mobile_list.xhtml @@ -255,20 +255,20 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_show_cellphone - /admin/cellphone/admin_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_mobile_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_mobile_edit.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml - admin_delete_cellphone - /admin/cellphone/admin_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_mobile_delete.xhtml admin_edit_user @@ -302,54 +302,54 @@ /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_contact_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_contact_mobile_delete.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml - admin_show_cellphone - /admin/cellphone/admin_contact_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_contact_mobile_show.xhtml - /admin/cellphone/admin_contact_cellphone_list.xhtml + /admin/mobile/admin_contact_mobile_list.xhtml - admin_show_cellphone - /admin/cellphone/admin_contact_cellphone_show.xhtml + admin_show_mobile + /admin/mobile/admin_contact_mobile_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_contact_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_contact_mobile_delete.xhtml - /admin/cellphone/admin_contact_cellphone_show.xhtml + /admin/mobile/admin_contact_mobile_show.xhtml admin_show_mobile_provider /admin/mobile_provider/admin_mobile_provider_show.xhtml - admin_edit_cellphone - /admin/cellphone/admin_contact_cellphone_edit.xhtml + admin_edit_mobile + /admin/mobile/admin_contact_mobile_edit.xhtml - admin_delete_cellphone - /admin/cellphone/admin_contact_cellphone_delete.xhtml + admin_delete_mobile + /admin/mobile/admin_contact_mobile_delete.xhtml - admin_unlink_contact_cellphone - /admin/cellphone/admin_contact_cellphone_unlink.xhtml + admin_unlink_contact_mobile + /admin/mobile/admin_contact_mobile_unlink.xhtml admin_show_contact diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl deleted file mode 100644 index a7a3b925..00000000 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - -
- - - diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl index 3709e10e..c8e0312f 100644 --- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl +++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl @@ -261,7 +261,7 @@
- +
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl similarity index 90% rename from web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl rename to web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl index 06e96e21..0a978f2d 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_form_contact_cellphone.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl @@ -7,6 +7,6 @@ - + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl similarity index 78% rename from web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl rename to web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl index 4f127340..d61a81d3 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_add_show.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl @@ -8,10 +8,10 @@ - + - + diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl new file mode 100644 index 00000000..a5407b0f --- /dev/null +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl similarity index 90% rename from web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl rename to web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl index 60540cea..00003dfe 100644 --- a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl +++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl @@ -11,7 +11,7 @@
  • - + @@ -19,7 +19,7 @@
  • - + @@ -27,7 +27,7 @@
  • - + @@ -36,7 +36,7 @@
  • - + diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 802358a6..cd3f06de 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -276,7 +276,7 @@
    - +
    diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl index fd7e654a..9f089774 100644 --- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl +++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl @@ -6,14 +6,14 @@ xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - - + + diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl index c07943f6..ad2b41c0 100644 --- a/web/WEB-INF/templates/login/user/user_menu.tpl +++ b/web/WEB-INF/templates/login/user/user_menu.tpl @@ -39,24 +39,6 @@
-
- -
- -
    -
  • - -
    • - -
  • - -
    • - -
  • - -
    • -
-
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml index 4b3ecb30..fc7b3abe 100644 --- a/web/admin/contact/admin_contact_show.xhtml +++ b/web/admin/contact/admin_contact_show.xhtml @@ -29,7 +29,7 @@
- +
diff --git a/web/admin/cellphone/admin_cellphone_delete.xhtml b/web/admin/mobile/admin_cellphone_delete.xhtml similarity index 100% rename from web/admin/cellphone/admin_cellphone_delete.xhtml rename to web/admin/mobile/admin_cellphone_delete.xhtml diff --git a/web/admin/cellphone/admin_cellphone_edit.xhtml b/web/admin/mobile/admin_cellphone_edit.xhtml similarity index 100% rename from web/admin/cellphone/admin_cellphone_edit.xhtml rename to web/admin/mobile/admin_cellphone_edit.xhtml diff --git a/web/admin/cellphone/admin_cellphone_show.xhtml b/web/admin/mobile/admin_cellphone_show.xhtml similarity index 90% rename from web/admin/cellphone/admin_cellphone_show.xhtml rename to web/admin/mobile/admin_cellphone_show.xhtml index 4e040639..6123eff1 100644 --- a/web/admin/cellphone/admin_cellphone_show.xhtml +++ b/web/admin/mobile/admin_cellphone_show.xhtml @@ -19,11 +19,11 @@ - + - + @@ -77,7 +77,7 @@
  • - + diff --git a/web/admin/cellphone/admin_contact_cellphone_list.xhtml b/web/admin/mobile/admin_contact_cellphone_list.xhtml similarity index 76% rename from web/admin/cellphone/admin_contact_cellphone_list.xhtml rename to web/admin/mobile/admin_contact_cellphone_list.xhtml index b319d1e6..c67245d8 100644 --- a/web/admin/cellphone/admin_contact_cellphone_list.xhtml +++ b/web/admin/mobile/admin_contact_cellphone_list.xhtml @@ -15,7 +15,7 @@ - + diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/mobile/admin_contact_cellphone_unlink.xhtml similarity index 100% rename from web/admin/cellphone/admin_contact_cellphone_unlink.xhtml rename to web/admin/mobile/admin_contact_cellphone_unlink.xhtml diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml index ca7e8dda..5a7ebfa8 100644 --- a/web/admin/user/admin_user_show.xhtml +++ b/web/admin/user/admin_user_show.xhtml @@ -184,7 +184,7 @@
- +
diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml deleted file mode 100644 index 6a1aa0b9..00000000 --- a/web/guest/user/show_addressbook.xhtml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK} - #{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK} - - - - - #{msg.TABLE_HEADER_SHOW_ADDRESSBOOK} - - #{msg.ADDRESSBOOK_NAME} - - - #{msg.ADDRESSBOOK_OWNER} - - - - - #{msg.ADDRESSBOOK_CREATED} - - - - - #{msg.ADDRESSBOOK_STATUS} - - - - - - - - - - - - - - diff --git a/web/guest/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml deleted file mode 100644 index 88472995..00000000 --- a/web/guest/user/show_addressbook_entries.xhtml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - #{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK_ENTRIES} - - - - Here goes your content. - - - diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml index afcb44da..560a3073 100644 --- a/web/guest/user/user_list.xhtml +++ b/web/guest/user/user_list.xhtml @@ -37,18 +37,6 @@ #{msg.USER_CREATED} - - - #{msg.USER_LIST_SHARING_ADDRESSBOOKS} - - - - - - - - -
diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml deleted file mode 100644 index ffb94fcb..00000000 --- a/web/user/login_add_addressbook.xhtml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_ADD_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK} - - - - - -
-
- #{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE} -
- -
-
- -
- -
- - - -
-
- -
- - -
-
- - - - - - - - - diff --git a/web/user/login_list_sharing_addressbooks.xhtml b/web/user/login_list_sharing_addressbooks.xhtml deleted file mode 100644 index 5e3c94ea..00000000 --- a/web/user/login_list_sharing_addressbooks.xhtml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - #{msg.PAGE_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS} - - - #{msg.CONTENT_TITLE_LOGIN_LIST_SHARING_ADDRESSBOOKS} - - - - - - Here goes your content. - - - - - - - - - - - - - diff --git a/web/user/login_other_addressbooks.xhtml b/web/user/login_other_addressbooks.xhtml deleted file mode 100644 index 84602842..00000000 --- a/web/user/login_other_addressbooks.xhtml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS} - - - #{msg.CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS} - - - - - Here goes your content. - - - - - - - - diff --git a/web/user/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml deleted file mode 100644 index 126fa9f8..00000000 --- a/web/user/login_own_addressbooks.xhtml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS} - - - #{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS} - - - - -
-
- #{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS} -
- -
- - - #{msg.ADDRESSBOOK_NAME} - - - - - - - - - #{msg.ADDRESSBOOK_TOTAL_ENTRIES} - - - - - - - - - #{msg.ADDRESSBOOK_CREATED} - - - - - - -
- -
- - -
-
- - - - - - - - diff --git a/web/user/login_shared_addressbooks.xhtml b/web/user/login_shared_addressbooks.xhtml deleted file mode 100644 index 94b3db87..00000000 --- a/web/user/login_shared_addressbooks.xhtml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_SHARED_ADDRESSBOOKS} - - - #{msg.CONTENT_TITLE_LOGIN_SHARED_ADDRESSBOOKS} - - - - -
-
- #{msg.LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS} -
- -
- - - #{msg.SHARED_ADDRESSBOOK} - - - - - - - - - #{msg.SHAREE_USER_NAME} - - - - - - - #{msg.SHARE_CREATED} - - - - - -
- -
- -
- -
- -
-
- - - - - - - - diff --git a/web/user/login_start_sharing_addressbook.xhtml b/web/user/login_start_sharing_addressbook.xhtml deleted file mode 100644 index aebbdd02..00000000 --- a/web/user/login_start_sharing_addressbook.xhtml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - #{msg.PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK} - - - #{msg.CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK} - - - - -
- -
- #{msg.TABLE_HEADER_CHOOSE_USER_FOR_SHARING} -
- -
- - - - - - #{msg.USER_ID} - - - - - #{msg.USER_NAME} - - - - - - - #{msg.LOGIN_START_SHARING_TITLE} - - - - - - - - - -
- -
-
    -
  • #{msg.LOGIN_START_SHARING_NOTICE1}
    • -
  • #{msg.LOGIN_START_SHARING_NOTICE2}
    • -
-
-
- - - - - - - - -- 2.39.5