From 7c11e29231535a288c7c69d7bda1d879184d3db8 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 4 Apr 2016 18:02:16 +0200 Subject: [PATCH] renamed files to make difference to other war-projects --- .../beans/addressbook/AddressbookWebSessionBean.java | 4 ++-- ...ava => AddressbookCountryWebApplicationBean.java} | 4 ++-- ... AddressbookCountryWebApplicationController.java} | 2 +- .../AddressbookEmailChangeWebSessionBean.java | 4 ++-- ...java => AddressbookGenderWebApplicationBean.java} | 4 ++-- ...> AddressbookGenderWebApplicationController.java} | 2 +- .../AddressbookLocalizationSessionBean.java | 2 +- ...=> AddressbookLocalizationSessionController.java} | 2 +- ....java => AddressbookUserLoginWebSessionBean.java} | 12 ++++++------ ...=> AddressbookUserLoginWebSessionController.java} | 2 +- ...ava => AddressbookUserProfileWebRequestBean.java} | 10 +++++----- ... AddressbookUserProfileWebRequestController.java} | 2 +- ...=> AddressbookProfileModeWebApplicationBean.java} | 4 ++-- ...ressbookProfileModeWebApplicationController.java} | 2 +- ...va => AddressbookUserRegisterWebSessionBean.java} | 8 ++++---- ...AddressbookUserRegisterWebSessionController.java} | 2 +- ...ean.java => AddressbookSharesWebSessionBean.java} | 8 ++++---- ...va => AddressbookSharesWebSessionController.java} | 2 +- ...=> AddressbookSmsProviderWebApplicationBean.java} | 4 ++-- ...ressbookSmsProviderWebApplicationController.java} | 2 +- ...nBean.java => AddressbookUserWebSessionBean.java} | 8 ++++---- ...java => AddressbookUserWebSessionController.java} | 2 +- ...nverter.java => AddressbookCountryConverter.java} | 4 ++-- ...ter.java => AddressbookSmsProviderConverter.java} | 4 ++-- ...rConverter.java => AddressbookUserConverter.java} | 10 +++++----- ...or.java => AddressbookUserPasswordValidator.java} | 6 +++--- web/WEB-INF/faces-config.xml | 4 ++-- .../templates/login/login_enter_current_password.tpl | 2 +- 28 files changed, 61 insertions(+), 61 deletions(-) rename src/java/org/mxchange/addressbook/beans/country/{CountryWebApplicationBean.java => AddressbookCountryWebApplicationBean.java} (93%) rename src/java/org/mxchange/addressbook/beans/country/{CountryWebApplicationController.java => AddressbookCountryWebApplicationController.java} (92%) rename src/java/org/mxchange/addressbook/beans/gender/{GenderWebApplicationBean.java => AddressbookGenderWebApplicationBean.java} (90%) rename src/java/org/mxchange/addressbook/beans/gender/{GenderWebApplicationController.java => AddressbookGenderWebApplicationController.java} (93%) rename src/java/org/mxchange/addressbook/beans/localization/{LocalizationSessionController.java => AddressbookLocalizationSessionController.java} (93%) rename src/java/org/mxchange/addressbook/beans/login/{UserLoginWebSessionBean.java => AddressbookUserLoginWebSessionBean.java} (90%) rename src/java/org/mxchange/addressbook/beans/login/{UserLoginWebSessionController.java => AddressbookUserLoginWebSessionController.java} (96%) rename src/java/org/mxchange/addressbook/beans/profile/{UserProfileWebRequestBean.java => AddressbookUserProfileWebRequestBean.java} (89%) rename src/java/org/mxchange/addressbook/beans/profile/{UserProfileWebRequestController.java => AddressbookUserProfileWebRequestController.java} (94%) rename src/java/org/mxchange/addressbook/beans/profilemode/{ProfileModeWebApplicationBean.java => AddressbookProfileModeWebApplicationBean.java} (88%) rename src/java/org/mxchange/addressbook/beans/profilemode/{ProfileModeWebApplicationController.java => AddressbookProfileModeWebApplicationController.java} (92%) rename src/java/org/mxchange/addressbook/beans/register/{UserRegisterWebSessionBean.java => AddressbookUserRegisterWebSessionBean.java} (93%) rename src/java/org/mxchange/addressbook/beans/register/{UserRegisterWebSessionController.java => AddressbookUserRegisterWebSessionController.java} (92%) rename src/java/org/mxchange/addressbook/beans/shares/{SharesWebSessionBean.java => AddressbookSharesWebSessionBean.java} (97%) rename src/java/org/mxchange/addressbook/beans/shares/{SharesWebSessionController.java => AddressbookSharesWebSessionController.java} (97%) rename src/java/org/mxchange/addressbook/beans/smsprovider/{SmsProviderWebApplicationBean.java => AddressbookSmsProviderWebApplicationBean.java} (93%) rename src/java/org/mxchange/addressbook/beans/smsprovider/{SmsProviderWebApplicationController.java => AddressbookSmsProviderWebApplicationController.java} (92%) rename src/java/org/mxchange/addressbook/beans/user/{UserWebSessionBean.java => AddressbookUserWebSessionBean.java} (98%) rename src/java/org/mxchange/addressbook/beans/user/{UserWebSessionController.java => AddressbookUserWebSessionController.java} (99%) rename src/java/org/mxchange/addressbook/converter/country/{CountryConverter.java => AddressbookCountryConverter.java} (97%) rename src/java/org/mxchange/addressbook/converter/smsprovider/{SmsProviderConverter.java => AddressbookSmsProviderConverter.java} (97%) rename src/java/org/mxchange/addressbook/converter/user/{UserConverter.java => AddressbookUserConverter.java} (90%) rename src/java/org/mxchange/addressbook/validators/password/{UserPasswordValidator.java => AddressbookUserPasswordValidator.java} (91%) diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index 1566cb29..a1bd778d 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -36,7 +36,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent; import org.mxchange.addressbook.events.addressbook.LoadedAddressbookEvent; import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException; @@ -47,6 +46,7 @@ import org.mxchange.addressbook.model.addressbook.UserAddressbook; import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * An address book bean (controller) @@ -108,7 +108,7 @@ public class AddressbookWebSessionBean implements AddressbookWebSessionControlle * Login controller */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; /** * A list of all user's address books diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java rename to src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java index 7c5f5a8b..0aa2bd18 100644 --- a/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcountry.data.Country; */ @Named ("country") @ApplicationScoped -public class CountryWebApplicationBean implements CountryWebApplicationController { +public class AddressbookCountryWebApplicationBean implements AddressbookCountryWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class CountryWebApplicationBean implements CountryWebApplicationControlle /** * Default constructor */ - public CountryWebApplicationBean () { + public AddressbookCountryWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java rename to src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java index 772fa300..82888821 100644 --- a/src/java/org/mxchange/addressbook/beans/country/CountryWebApplicationController.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface CountryWebApplicationController extends Serializable { +public interface AddressbookCountryWebApplicationController 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/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java index e246a2d3..7f4f1b04 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java @@ -26,13 +26,13 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jusercore.exceptions.UserPasswordMismatchException; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; import org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote; import org.mxchange.jusercore.model.user.User; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * A web session bean for changing email addresses @@ -72,7 +72,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha * Login bean (controller) */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; /** * Default constructor diff --git a/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java rename to src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java index 1bd0955c..29cc7270 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcontacts.contact.gender.GenderUtils; */ @Named ("gender") @ApplicationScoped -public class GenderWebApplicationBean implements GenderWebApplicationController { +public class AddressbookGenderWebApplicationBean implements AddressbookGenderWebApplicationController { /** * Serial number @@ -39,7 +39,7 @@ public class GenderWebApplicationBean implements GenderWebApplicationController /** * Default constructor */ - public GenderWebApplicationBean () { + public AddressbookGenderWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java rename to src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java index e4d9b700..c0469f07 100644 --- a/src/java/org/mxchange/addressbook/beans/gender/GenderWebApplicationController.java +++ b/src/java/org/mxchange/addressbook/beans/gender/AddressbookGenderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; *

* @author Roland Haeder */ -public interface GenderWebApplicationController extends Serializable { +public interface AddressbookGenderWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java index 190bb53d..dd587438 100644 --- a/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; */ @Named ("localization") @SessionScoped -public class AddressbookLocalizationSessionBean extends BaseDatabaseBean implements LocalizationSessionController { +public class AddressbookLocalizationSessionBean extends BaseDatabaseBean implements AddressbookLocalizationSessionController { /** * Serial number diff --git a/src/java/org/mxchange/addressbook/beans/localization/LocalizationSessionController.java b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/localization/LocalizationSessionController.java rename to src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java index 8caa0769..642a7f3e 100644 --- a/src/java/org/mxchange/addressbook/beans/localization/LocalizationSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/localization/AddressbookLocalizationSessionController.java @@ -24,7 +24,7 @@ import java.util.Locale; *

* @author Roland Haeder */ -public interface LocalizationSessionController extends Serializable { +public interface AddressbookLocalizationSessionController extends Serializable { /** * Getter for locale diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java similarity index 90% rename from src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java rename to src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java index ea3477e7..fa65e6a4 100644 --- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.events.login.UserLoggedInEvent; @@ -40,6 +39,7 @@ import org.mxchange.jusercore.model.user.User; 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.addressbook.beans.user.AddressbookUserWebSessionController; /** * A web bean for user registration @@ -48,7 +48,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("loginController") @SessionScoped -public class UserLoginWebSessionBean implements UserLoginWebSessionController { +public class AddressbookUserLoginWebSessionBean implements AddressbookUserLoginWebSessionController { /** * Serial number @@ -87,7 +87,7 @@ public class UserLoginWebSessionBean implements UserLoginWebSessionController { * User controller */ @Inject - private UserWebSessionController userController; + private AddressbookUserWebSessionController userController; /** * Flag whether the user has logged-in, set only from inside @@ -97,7 +97,7 @@ public class UserLoginWebSessionBean implements UserLoginWebSessionController { /** * Default constructor */ - public UserLoginWebSessionBean () { + public AddressbookUserLoginWebSessionBean () { try { // Get initial context Context context = new InitialContext(); @@ -207,13 +207,13 @@ public class UserLoginWebSessionBean implements UserLoginWebSessionController { @Override public boolean isUserLoggedIn () { // Trace message - // NOISY: System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); + // NOISY: System.out.println(MessageFormat.format("AddressbookUserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); // Compare instance this.userLoggedIn = ((this.getLoggedInUser() instanceof User) && (Objects.equals(this.getLoggedInUser().getUserAccountStatus(), UserAccountStatus.CONFIRMED))); // Trace message - // NOISY: System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); + // NOISY: System.out.println(MessageFormat.format("AddressbookUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); // Return it return this.userLoggedIn; diff --git a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java similarity index 96% rename from src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java rename to src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java index 5f3f3ad8..1e74b836 100644 --- a/src/java/org/mxchange/addressbook/beans/login/UserLoginWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserLoginWebSessionController extends Serializable { +public interface AddressbookUserLoginWebSessionController extends Serializable { /** * Getter for template type diff --git a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java rename to src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java index bca32ee9..a5175559 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestBean.java +++ b/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestBean.java @@ -21,11 +21,11 @@ import javax.enterprise.context.RequestScoped; import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; -import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; +import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; /** * A web request bean for user profiles @@ -34,7 +34,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "profileController") @RequestScoped -public class UserProfileWebRequestBean implements UserProfileWebRequestController { +public class AddressbookUserProfileWebRequestBean implements AddressbookUserProfileWebRequestController { /** * Serial number @@ -45,13 +45,13 @@ public class UserProfileWebRequestBean implements UserProfileWebRequestControlle * Login controller */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; /** * User controller */ @Inject - private UserWebSessionController userController; + private AddressbookUserWebSessionController userController; @Override public boolean isProfileLinkVisibleById (final Long userId) { diff --git a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java b/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java similarity index 94% rename from src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java rename to src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java index 4130326e..871edd37 100644 --- a/src/java/org/mxchange/addressbook/beans/profile/UserProfileWebRequestController.java +++ b/src/java/org/mxchange/addressbook/beans/profile/AddressbookUserProfileWebRequestController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserProfileWebRequestController extends Serializable { +public interface AddressbookUserProfileWebRequestController extends Serializable { /** * Checks if the user profile link is visible diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java similarity index 88% rename from src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java rename to src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java index 31a1286e..e39bb52d 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationBean.java @@ -27,7 +27,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileMode") @ApplicationScoped -public class ProfileModeWebApplicationBean implements ProfileModeWebApplicationController { +public class AddressbookProfileModeWebApplicationBean implements AddressbookProfileModeWebApplicationController { /** * Serial number @@ -37,7 +37,7 @@ public class ProfileModeWebApplicationBean implements ProfileModeWebApplicationC /** * Default constructor */ - public ProfileModeWebApplicationBean () { + public AddressbookProfileModeWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java rename to src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java index 8a96fe68..c9858184 100644 --- a/src/java/org/mxchange/addressbook/beans/profilemode/ProfileModeWebApplicationController.java +++ b/src/java/org/mxchange/addressbook/beans/profilemode/AddressbookProfileModeWebApplicationController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface ProfileModeWebApplicationController extends Serializable { +public interface AddressbookProfileModeWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java rename to src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java index 0d59b180..74cd5f35 100644 --- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jusercore.events.registration.RegisteredUserEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; @@ -36,6 +35,7 @@ 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.addressbook.beans.user.AddressbookUserWebSessionController; /** * A web bean for user registration @@ -44,7 +44,7 @@ import org.mxchange.jusercore.model.user.status.UserAccountStatus; */ @Named ("registerController") @SessionScoped -public class UserRegisterWebSessionBean implements UserRegisterWebSessionController { +public class AddressbookUserRegisterWebSessionBean implements AddressbookUserRegisterWebSessionController { /** * Serial number @@ -67,12 +67,12 @@ public class UserRegisterWebSessionBean implements UserRegisterWebSessionControl * User controller */ @Inject - private UserWebSessionController userController; + private AddressbookUserWebSessionController userController; /** * Default constructor */ - public UserRegisterWebSessionBean () { + public AddressbookUserRegisterWebSessionBean () { try { // Get initial context Context context = new InitialContext(); diff --git a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java rename to src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java index 270cbc41..eccd06dd 100644 --- a/src/java/org/mxchange/addressbook/beans/register/UserRegisterWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionController.java @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Haeder */ -public interface UserRegisterWebSessionController extends Serializable { +public interface AddressbookUserRegisterWebSessionController extends Serializable { /** * Registers the user, if not found. Otherwise this method should throw an diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java rename to src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java index 91f10012..84ae04c7 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionBean.java @@ -31,7 +31,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.addressbook.events.sharing.AddressbookSharingEvent; import org.mxchange.addressbook.events.sharing.StartedAddressbookSharingEvent; import org.mxchange.addressbook.events.sharing.type.SharingType; @@ -42,6 +41,7 @@ import org.mxchange.addressbook.model.shared.SharedAddressbooksSessionBeanRemote import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * A bean for sharing address books with other users @@ -50,7 +50,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named (value = "shareController") @SessionScoped -public class SharesWebSessionBean implements SharesWebSessionController { +public class AddressbookSharesWebSessionBean implements AddressbookSharesWebSessionController { /** * Serial number @@ -66,7 +66,7 @@ public class SharesWebSessionBean implements SharesWebSessionController { * Login controller injection */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; /** * Share instance @@ -98,7 +98,7 @@ public class SharesWebSessionBean implements SharesWebSessionController { /** * Default constructor */ - public SharesWebSessionBean () { + public AddressbookSharesWebSessionBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java similarity index 97% rename from src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java rename to src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java index 5b5c8a83..a6926248 100644 --- a/src/java/org/mxchange/addressbook/beans/shares/SharesWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/shares/AddressbookSharesWebSessionController.java @@ -29,7 +29,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface SharesWebSessionController extends Serializable { +public interface AddressbookSharesWebSessionController extends Serializable { /** * Observer method for ended sharing events diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java similarity index 93% rename from src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java rename to src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java index 06ed4cad..cb7e5d86 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; */ @Named ("cellphone") @ApplicationScoped -public class SmsProviderWebApplicationBean implements SmsProviderWebApplicationController { +public class AddressbookSmsProviderWebApplicationBean implements AddressbookSmsProviderWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class SmsProviderWebApplicationBean implements SmsProviderWebApplicationC /** * Default constructor */ - public SmsProviderWebApplicationBean () { + public AddressbookSmsProviderWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationController.java similarity index 92% rename from src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java rename to src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationController.java index 8fac9b71..ea0e083d 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/SmsProviderWebApplicationController.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; *

* @author Roland Haeder */ -public interface SmsProviderWebApplicationController extends Serializable { +public interface AddressbookSmsProviderWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java similarity index 98% rename from src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java rename to src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index eb9c707a..89dc6416 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -32,7 +32,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; @@ -51,6 +50,7 @@ import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * A user bean (controller) @@ -59,7 +59,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("userController") @SessionScoped -public class UserWebSessionBean implements UserWebSessionController { +public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionController { /** * Serial number @@ -161,7 +161,7 @@ public class UserWebSessionBean implements UserWebSessionController { * Login bean (controller) */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; /** * Phone number area code @@ -231,7 +231,7 @@ public class UserWebSessionBean implements UserWebSessionController { /** * Default constructor */ - public UserWebSessionBean () { + public AddressbookUserWebSessionBean () { // Set gender to UNKNOWN this.gender = Gender.UNKNOWN; diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java similarity index 99% rename from src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java rename to src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java index 208bb073..b88a2f4b 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java @@ -33,7 +33,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface UserWebSessionController extends Serializable { +public interface AddressbookUserWebSessionController extends Serializable { /** * Tries to lookup user by given id number. If the user is not found or the diff --git a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java similarity index 97% rename from src/java/org/mxchange/addressbook/converter/country/CountryConverter.java rename to src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java index 60998920..3bae345e 100644 --- a/src/java/org/mxchange/addressbook/converter/country/CountryConverter.java +++ b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java @@ -37,7 +37,7 @@ import org.mxchange.jcountry.data.Country; * @author Roland Haeder */ @FacesConverter (value = "country") -public class CountryConverter implements Converter { +public class AddressbookCountryConverter implements Converter { /** * Country bean @@ -53,7 +53,7 @@ public class CountryConverter implements Converter { /** * Initialization of this converter */ - public CountryConverter () { + public AddressbookCountryConverter () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java b/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java similarity index 97% rename from src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java rename to src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java index 77c5a192..737b1808 100644 --- a/src/java/org/mxchange/addressbook/converter/smsprovider/SmsProviderConverter.java +++ b/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java @@ -37,7 +37,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; * @author Roland Haeder */ @FacesConverter (value = "cellphoneCarrier") -public class SmsProviderConverter implements Converter { +public class AddressbookSmsProviderConverter implements Converter { /** * Logger instance @@ -53,7 +53,7 @@ public class SmsProviderConverter implements Converter { /** * Initialization of this converter */ - public SmsProviderConverter () { + public AddressbookSmsProviderConverter () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/addressbook/converter/user/UserConverter.java b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java similarity index 90% rename from src/java/org/mxchange/addressbook/converter/user/UserConverter.java rename to src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java index 9961341d..9ad4e833 100644 --- a/src/java/org/mxchange/addressbook/converter/user/UserConverter.java +++ b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java @@ -25,11 +25,11 @@ import javax.faces.convert.FacesConverter; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.addressbook.beans.user.UserWebSessionController; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; +import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; /** * Converter for user id <-> valid user instance @@ -37,7 +37,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Haeder */ @FacesConverter (value = "UserConverter") -public class UserConverter implements Converter { +public class AddressbookUserConverter implements Converter { /** * Logger instance @@ -48,12 +48,12 @@ public class UserConverter implements Converter { /** * User bean */ - private UserWebSessionController userController; + private AddressbookUserWebSessionController userController; /** * Initialization of this converter */ - public UserConverter () { + public AddressbookUserConverter () { // Try to get it try { // Get initial context @@ -63,7 +63,7 @@ public class UserConverter 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.userController = (UserWebSessionController) context.lookup("java:global/juser-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userController = (AddressbookUserWebSessionController) context.lookup("java:global/juser-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException("context.lookup() failed.", ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/validators/password/UserPasswordValidator.java b/src/java/org/mxchange/addressbook/validators/password/AddressbookUserPasswordValidator.java similarity index 91% rename from src/java/org/mxchange/addressbook/validators/password/UserPasswordValidator.java rename to src/java/org/mxchange/addressbook/validators/password/AddressbookUserPasswordValidator.java index 22308bd0..44ecda37 100644 --- a/src/java/org/mxchange/addressbook/validators/password/UserPasswordValidator.java +++ b/src/java/org/mxchange/addressbook/validators/password/AddressbookUserPasswordValidator.java @@ -23,11 +23,11 @@ import javax.faces.validator.FacesValidator; import javax.faces.validator.Validator; import javax.faces.validator.ValidatorException; import javax.inject.Inject; -import org.mxchange.addressbook.beans.login.UserLoginWebSessionController; 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; /** * A validator for validating passwords (if they match with stored) @@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.UserUtils; * @author Roland Haeder */ @FacesValidator (value = "UserPasswordValidator") -public class UserPasswordValidator extends BaseStringValidator implements Validator { +public class AddressbookUserPasswordValidator extends BaseStringValidator implements Validator { /** * Serial number @@ -46,7 +46,7 @@ public class UserPasswordValidator extends BaseStringValidator implements Valida * User login controller */ @Inject - private UserLoginWebSessionController loginController; + private AddressbookUserLoginWebSessionController loginController; @Override public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 470ae276..c7261f80 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -38,8 +38,8 @@ org.mxchange.addressbook.validator.user.UserIdValidator - UserPasswordValidator - org.mxchange.addressbook.validators.password.UserPasswordValidator + AddressbookUserPasswordValidator + org.mxchange.addressbook.validators.password.AddressbookUserPasswordValidator * diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/login_enter_current_password.tpl index eb11c933..b9f299ec 100644 --- a/web/WEB-INF/templates/login/login_enter_current_password.tpl +++ b/web/WEB-INF/templates/login/login_enter_current_password.tpl @@ -16,7 +16,7 @@

- +
-- 2.39.5