From 32cdee28326d7f38c3db226dbd029467b65975aa Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 4 Apr 2016 18:06:48 +0200 Subject: [PATCH] renamed files to make difference to other war-projects --- ...nBean.java => JobsAddressbookWebSessionBean.java} | 8 ++++---- ...java => JobsAddressbookWebSessionController.java} | 2 +- ...nBean.java => JobsCountryWebApplicationBean.java} | 4 ++-- ...java => JobsCountryWebApplicationController.java} | 2 +- .../email_address/JobsEmailChangeWebSessionBean.java | 4 ++-- ...onBean.java => JobsGenderWebApplicationBean.java} | 4 ++-- ....java => JobsGenderWebApplicationController.java} | 2 +- .../localization/JobsLocalizationSessionBean.java | 2 +- ...r.java => JobsLocalizationSessionController.java} | 2 +- ...ionBean.java => JobsUserLoginWebSessionBean.java} | 12 ++++++------ ...r.java => JobsUserLoginWebSessionController.java} | 2 +- ...tBean.java => JobsUserProfileWebRequestBean.java} | 10 +++++----- ...java => JobsUserProfileWebRequestController.java} | 2 +- ...n.java => JobsProfileModeWebApplicationBean.java} | 4 ++-- ... => JobsProfileModeWebApplicationController.java} | 2 +- ...Bean.java => JobsUserRegisterWebSessionBean.java} | 8 ++++---- ...ava => JobsUserRegisterWebSessionController.java} | 2 +- ...n.java => JobsSmsProviderWebApplicationBean.java} | 4 ++-- ... => JobsSmsProviderWebApplicationController.java} | 2 +- ...bSessionBean.java => JobsUserWebSessionBean.java} | 8 ++++---- ...roller.java => JobsUserWebSessionController.java} | 2 +- ...untryConverter.java => JobsCountryConverter.java} | 4 ++-- ...rConverter.java => JobsSmsProviderConverter.java} | 4 ++-- .../{UserConverter.java => JobsUserConverter.java} | 10 +++++----- ...Validator.java => JobsUserPasswordValidator.java} | 10 +++++----- web/WEB-INF/faces-config.xml | 4 ++-- .../templates/login/login_enter_current_password.tpl | 2 +- 27 files changed, 61 insertions(+), 61 deletions(-) rename src/java/org/mxchange/jjobs/beans/addressbook/{AddressbookWebSessionBean.java => JobsAddressbookWebSessionBean.java} (97%) rename src/java/org/mxchange/jjobs/beans/addressbook/{AddressbookWebSessionController.java => JobsAddressbookWebSessionController.java} (98%) rename src/java/org/mxchange/jjobs/beans/country/{CountryWebApplicationBean.java => JobsCountryWebApplicationBean.java} (94%) rename src/java/org/mxchange/jjobs/beans/country/{CountryWebApplicationController.java => JobsCountryWebApplicationController.java} (93%) rename src/java/org/mxchange/jjobs/beans/gender/{GenderWebApplicationBean.java => JobsGenderWebApplicationBean.java} (91%) rename src/java/org/mxchange/jjobs/beans/gender/{GenderWebApplicationController.java => JobsGenderWebApplicationController.java} (94%) rename src/java/org/mxchange/jjobs/beans/localization/{LocalizationSessionController.java => JobsLocalizationSessionController.java} (93%) rename src/java/org/mxchange/jjobs/beans/login/{UserLoginWebSessionBean.java => JobsUserLoginWebSessionBean.java} (90%) rename src/java/org/mxchange/jjobs/beans/login/{UserLoginWebSessionController.java => JobsUserLoginWebSessionController.java} (97%) rename src/java/org/mxchange/jjobs/beans/profile/{UserProfileWebRequestBean.java => JobsUserProfileWebRequestBean.java} (90%) rename src/java/org/mxchange/jjobs/beans/profile/{UserProfileWebRequestController.java => JobsUserProfileWebRequestController.java} (94%) rename src/java/org/mxchange/jjobs/beans/profilemode/{ProfileModeWebApplicationBean.java => JobsProfileModeWebApplicationBean.java} (89%) rename src/java/org/mxchange/jjobs/beans/profilemode/{ProfileModeWebApplicationController.java => JobsProfileModeWebApplicationController.java} (93%) rename src/java/org/mxchange/jjobs/beans/register/{UserRegisterWebSessionBean.java => JobsUserRegisterWebSessionBean.java} (94%) rename src/java/org/mxchange/jjobs/beans/register/{UserRegisterWebSessionController.java => JobsUserRegisterWebSessionController.java} (93%) rename src/java/org/mxchange/jjobs/beans/smsprovider/{SmsProviderWebApplicationBean.java => JobsSmsProviderWebApplicationBean.java} (94%) rename src/java/org/mxchange/jjobs/beans/smsprovider/{SmsProviderWebApplicationController.java => JobsSmsProviderWebApplicationController.java} (93%) rename src/java/org/mxchange/jjobs/beans/user/{UserWebSessionBean.java => JobsUserWebSessionBean.java} (99%) rename src/java/org/mxchange/jjobs/beans/user/{UserWebSessionController.java => JobsUserWebSessionController.java} (99%) rename src/java/org/mxchange/jjobs/converter/country/{CountryConverter.java => JobsCountryConverter.java} (98%) rename src/java/org/mxchange/jjobs/converter/smsprovider/{SmsProviderConverter.java => JobsSmsProviderConverter.java} (97%) rename src/java/org/mxchange/jjobs/converter/user/{UserConverter.java => JobsUserConverter.java} (91%) rename src/java/org/mxchange/jjobs/validators/password/{UserPasswordValidator.java => JobsUserPasswordValidator.java} (91%) diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java rename to src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java index c222e7eb..818242f5 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java @@ -34,7 +34,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jjobs.beans.login.UserLoginWebSessionController; import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent; import org.mxchange.jjobs.events.addressbook.LoadedAddressbookEvent; import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException; @@ -45,6 +44,7 @@ import org.mxchange.jjobs.model.addressbook.UserAddressbook; import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; /** * An address book bean (controller) @@ -53,7 +53,7 @@ import org.mxchange.jusercore.model.user.User; */ @Named ("addressbookController") @SessionScoped -public class AddressbookWebSessionBean implements AddressbookWebSessionController { +public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionController { /** * Serial number @@ -101,7 +101,7 @@ public class AddressbookWebSessionBean implements AddressbookWebSessionControlle * Login controller */ @Inject - private UserLoginWebSessionController loginController; + private JobsUserLoginWebSessionController loginController; /** * A list of all user's address books @@ -111,7 +111,7 @@ public class AddressbookWebSessionBean implements AddressbookWebSessionControlle /** * Default constructor */ - public AddressbookWebSessionBean () { + public JobsAddressbookWebSessionBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java similarity index 98% rename from src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java rename to src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java index 2ae2039d..ee47235e 100644 --- a/src/java/org/mxchange/jjobs/beans/addressbook/AddressbookWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java @@ -30,7 +30,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface AddressbookWebSessionController extends Serializable { +public interface JobsAddressbookWebSessionController extends Serializable { /** * Checks whether the user has created addressbooks. For this method to work diff --git a/src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationBean.java rename to src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java index 6dd32be0..31cf9d7e 100644 --- a/src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcountry.data.JobsCountrySingletonBeanRemote; */ @Named ("country") @ApplicationScoped -public class CountryWebApplicationBean implements CountryWebApplicationController { +public class JobsCountryWebApplicationBean implements JobsCountryWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class CountryWebApplicationBean implements CountryWebApplicationControlle /** * Default constructor */ - public CountryWebApplicationBean () { + public JobsCountryWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationController.java rename to src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java index 9890bbb1..78550df4 100644 --- a/src/java/org/mxchange/jjobs/beans/country/CountryWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface CountryWebApplicationController extends Serializable { +public interface JobsCountryWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java index 4afba2a0..dadf05c3 100644 --- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java @@ -27,12 +27,12 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; -import org.mxchange.jjobs.beans.login.UserLoginWebSessionController; 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.jjobs.beans.login.JobsUserLoginWebSessionController; /** * A web session bean for changing email addresses @@ -72,7 +72,7 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC * Login bean (controller) */ @Inject - private UserLoginWebSessionController loginController; + private JobsUserLoginWebSessionController loginController; /** * Default constructor diff --git a/src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java similarity index 91% rename from src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationBean.java rename to src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java index 947cfdd2..e877950c 100644 --- a/src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcontacts.contact.gender.GenderUtils; */ @Named ("gender") @ApplicationScoped -public class GenderWebApplicationBean implements GenderWebApplicationController { +public class JobsGenderWebApplicationBean implements JobsGenderWebApplicationController { /** * Serial number @@ -39,7 +39,7 @@ public class GenderWebApplicationBean implements GenderWebApplicationController /** * Default constructor */ - public GenderWebApplicationBean () { + public JobsGenderWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationController.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationController.java rename to src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationController.java index 5de7cd86..cfce37a8 100644 --- a/src/java/org/mxchange/jjobs/beans/gender/GenderWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/gender/JobsGenderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; *

* @author Roland Haeder */ -public interface GenderWebApplicationController extends Serializable { +public interface JobsGenderWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java index 106f1abb..30dc3135 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionBean.java @@ -33,7 +33,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; */ @Named ("localization") @SessionScoped -public class JobsLocalizationSessionBean extends BaseDatabaseBean implements LocalizationSessionController { +public class JobsLocalizationSessionBean extends BaseDatabaseBean implements JobsLocalizationSessionController { /** * Serial number diff --git a/src/java/org/mxchange/jjobs/beans/localization/LocalizationSessionController.java b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/localization/LocalizationSessionController.java rename to src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java index 09e4ccf0..73f6e92f 100644 --- a/src/java/org/mxchange/jjobs/beans/localization/LocalizationSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/localization/JobsLocalizationSessionController.java @@ -24,7 +24,7 @@ import java.util.Locale; *

* @author Roland Haeder */ -public interface LocalizationSessionController extends Serializable { +public interface JobsLocalizationSessionController extends Serializable { /** * Getter for locale diff --git a/src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java similarity index 90% rename from src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionBean.java rename to src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 7e4e629f..aeaeaaac 100644 --- a/src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jjobs.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.jjobs.beans.user.JobsUserWebSessionController; /** * 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 JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionController { /** * Serial number @@ -87,7 +87,7 @@ public class UserLoginWebSessionBean implements UserLoginWebSessionController { * User controller */ @Inject - private UserWebSessionController userController; + private JobsUserWebSessionController 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 JobsUserLoginWebSessionBean () { try { // Get initial context Context context = new InitialContext(); @@ -207,13 +207,13 @@ public class UserLoginWebSessionBean implements UserLoginWebSessionController { @Override public boolean isUserLoggedIn () { // Trace message - // NOISY-DEBUG System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.loggedInUser={0},this.templateType={1} - CALLED!", this.getLoggedInUser(), this.getTemplateType())); + // NOISY-DEBUG System.out.println(MessageFormat.format("JobsUserLoginWebSessionBean: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-DEBUG System.out.println(MessageFormat.format("UserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); + // NOISY-DEBUG System.out.println(MessageFormat.format("JobsUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); // Return it return this.userLoggedIn; } diff --git a/src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionController.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java similarity index 97% rename from src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionController.java rename to src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java index c9bd399c..7815f2f4 100644 --- a/src/java/org/mxchange/jjobs/beans/login/UserLoginWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserLoginWebSessionController extends Serializable { +public interface JobsUserLoginWebSessionController extends Serializable { /** * Getter for template type diff --git a/src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java similarity index 90% rename from src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.java index d5b49efe..0267f931 100644 --- a/src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestBean.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.jjobs.beans.login.UserLoginWebSessionController; -import org.mxchange.jjobs.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.jjobs.beans.login.JobsUserLoginWebSessionController; +import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; /** * 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 JobsUserProfileWebRequestBean implements JobsUserProfileWebRequestController { /** * Serial number @@ -45,13 +45,13 @@ public class UserProfileWebRequestBean implements UserProfileWebRequestControlle * Login controller */ @Inject - private UserLoginWebSessionController loginController; + private JobsUserLoginWebSessionController loginController; /** * User controller */ @Inject - private UserWebSessionController userController; + private JobsUserWebSessionController userController; @Override public boolean isProfileLinkVisibleById (final Long userId) { diff --git a/src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestController.java b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestController.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestController.java index 968b68e4..6789f81e 100644 --- a/src/java/org/mxchange/jjobs/beans/profile/UserProfileWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/profile/JobsUserProfileWebRequestController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.User; *

* @author Roland Haeder */ -public interface UserProfileWebRequestController extends Serializable { +public interface JobsUserProfileWebRequestController extends Serializable { /** * Checks if the user profile link is visible diff --git a/src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java similarity index 89% rename from src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationBean.java rename to src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java index fe539003..c5b8926d 100644 --- a/src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationBean.java @@ -27,7 +27,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("profileMode") @ApplicationScoped -public class ProfileModeWebApplicationBean implements ProfileModeWebApplicationController { +public class JobsProfileModeWebApplicationBean implements JobsProfileModeWebApplicationController { /** * Serial number @@ -37,7 +37,7 @@ public class ProfileModeWebApplicationBean implements ProfileModeWebApplicationC /** * Default constructor */ - public ProfileModeWebApplicationBean () { + public JobsProfileModeWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationController.java rename to src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java index 34fffbd0..38bc58a1 100644 --- a/src/java/org/mxchange/jjobs/beans/profilemode/ProfileModeWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/profilemode/JobsProfileModeWebApplicationController.java @@ -24,7 +24,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface ProfileModeWebApplicationController extends Serializable { +public interface JobsProfileModeWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionBean.java rename to src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java index 9d237730..675f0ef0 100644 --- a/src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java @@ -26,7 +26,6 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jjobs.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.jjobs.beans.user.JobsUserWebSessionController; /** * 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 JobsUserRegisterWebSessionBean implements JobsUserRegisterWebSessionController { /** * Serial number @@ -67,12 +67,12 @@ public class UserRegisterWebSessionBean implements UserRegisterWebSessionControl * User controller */ @Inject - private UserWebSessionController userController; + private JobsUserWebSessionController userController; /** * Default constructor */ - public UserRegisterWebSessionBean () { + public JobsUserRegisterWebSessionBean () { try { // Get initial context Context context = new InitialContext(); diff --git a/src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionController.java b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionController.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionController.java rename to src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionController.java index 45941082..e414b7d2 100644 --- a/src/java/org/mxchange/jjobs/beans/register/UserRegisterWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionController.java @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Haeder */ -public interface UserRegisterWebSessionController extends Serializable { +public interface JobsUserRegisterWebSessionController extends Serializable { /** * Registers the user, if not found. Otherwise this method should throw an diff --git a/src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationBean.java rename to src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java index b049d789..e43b28f4 100644 --- a/src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; */ @Named ("cellphone") @ApplicationScoped -public class SmsProviderWebApplicationBean implements SmsProviderWebApplicationController { +public class JobsSmsProviderWebApplicationBean implements JobsSmsProviderWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class SmsProviderWebApplicationBean implements SmsProviderWebApplicationC /** * Default constructor */ - public SmsProviderWebApplicationBean () { + public JobsSmsProviderWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationController.java b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationController.java rename to src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationController.java index 3f895662..e7f08f6b 100644 --- a/src/java/org/mxchange/jjobs/beans/smsprovider/SmsProviderWebApplicationController.java +++ b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; *

* @author Roland Haeder */ -public interface SmsProviderWebApplicationController extends Serializable { +public interface JobsSmsProviderWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java similarity index 99% rename from src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java rename to src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java index d7cd66dd..bc1ff54d 100644 --- a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java @@ -36,7 +36,6 @@ import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcountry.data.Country; -import org.mxchange.jjobs.beans.login.UserLoginWebSessionController; import org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber; import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -52,6 +51,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.jjobs.beans.login.JobsUserLoginWebSessionController; /** * A user bean (controller) @@ -60,7 +60,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; */ @Named ("userController") @SessionScoped -public class UserWebSessionBean implements UserWebSessionController { +public class JobsUserWebSessionBean implements JobsUserWebSessionController { /** * Serial number @@ -151,7 +151,7 @@ public class UserWebSessionBean implements UserWebSessionController { * Login bean (controller) */ @Inject - private UserLoginWebSessionController loginController; + private JobsUserLoginWebSessionController loginController; /** * Phone number area code @@ -221,7 +221,7 @@ public class UserWebSessionBean implements UserWebSessionController { /** * Default constructor */ - public UserWebSessionBean () { + public JobsUserWebSessionBean () { // Set gender to UNKNOWN this.gender = Gender.UNKNOWN; diff --git a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java similarity index 99% rename from src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java rename to src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java index d61335b8..3b9b1be5 100644 --- a/src/java/org/mxchange/jjobs/beans/user/UserWebSessionController.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionController.java @@ -33,7 +33,7 @@ import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; *

* @author Roland Haeder */ -public interface UserWebSessionController extends Serializable { +public interface JobsUserWebSessionController 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/jjobs/converter/country/CountryConverter.java b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java similarity index 98% rename from src/java/org/mxchange/jjobs/converter/country/CountryConverter.java rename to src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java index 0908687f..3c89ed6b 100644 --- a/src/java/org/mxchange/jjobs/converter/country/CountryConverter.java +++ b/src/java/org/mxchange/jjobs/converter/country/JobsCountryConverter.java @@ -37,7 +37,7 @@ import org.mxchange.jcountry.data.JobsCountrySingletonBeanRemote; * @author Roland Haeder */ @FacesConverter (value = "country") -public class CountryConverter implements Converter { +public class JobsCountryConverter implements Converter { /** * Country bean @@ -53,7 +53,7 @@ public class CountryConverter implements Converter { /** * Initialization of this converter */ - public CountryConverter () { + public JobsCountryConverter () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/converter/smsprovider/SmsProviderConverter.java b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java similarity index 97% rename from src/java/org/mxchange/jjobs/converter/smsprovider/SmsProviderConverter.java rename to src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java index 985e53bf..48475937 100644 --- a/src/java/org/mxchange/jjobs/converter/smsprovider/SmsProviderConverter.java +++ b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.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 JobsSmsProviderConverter implements Converter { /** * Logger instance @@ -53,7 +53,7 @@ public class SmsProviderConverter implements Converter { /** * Initialization of this converter */ - public SmsProviderConverter () { + public JobsSmsProviderConverter () { // Try to get it try { // Get initial context diff --git a/src/java/org/mxchange/jjobs/converter/user/UserConverter.java b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java similarity index 91% rename from src/java/org/mxchange/jjobs/converter/user/UserConverter.java rename to src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java index b2e0ae91..7a10d8dd 100644 --- a/src/java/org/mxchange/jjobs/converter/user/UserConverter.java +++ b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java @@ -28,9 +28,9 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; -import org.mxchange.jjobs.beans.user.UserWebSessionController; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; +import org.mxchange.jjobs.beans.user.JobsUserWebSessionController; /** * Converter for user id <-> valid user instance @@ -38,7 +38,7 @@ import org.mxchange.jusercore.model.user.User; * @author Roland Haeder */ @FacesConverter (value = "UserConverter") -public class UserConverter implements Converter { +public class JobsUserConverter implements Converter { /** * Logger instance @@ -50,12 +50,12 @@ public class UserConverter implements Converter { * User bean */ @Inject - private UserWebSessionController userController; + private JobsUserWebSessionController userController; /** * Constructor of this converter */ - public UserConverter () { + public JobsUserConverter () { // Try to get it try { // Get initial context @@ -65,7 +65,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 = (JobsUserWebSessionController) 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/jjobs/validators/password/UserPasswordValidator.java b/src/java/org/mxchange/jjobs/validators/password/JobsUserPasswordValidator.java similarity index 91% rename from src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java rename to src/java/org/mxchange/jjobs/validators/password/JobsUserPasswordValidator.java index 3fca5fd7..c5d172c1 100644 --- a/src/java/org/mxchange/jjobs/validators/password/UserPasswordValidator.java +++ b/src/java/org/mxchange/jjobs/validators/password/JobsUserPasswordValidator.java @@ -29,18 +29,18 @@ import javax.naming.NamingException; import org.mxchange.jcoreee.validator.string.BaseStringValidator; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; -import org.mxchange.jjobs.beans.login.UserLoginWebSessionController; import org.mxchange.jusercore.container.login.LoginContainer; import org.mxchange.jusercore.container.login.UserLoginContainer; import org.mxchange.jusercore.model.user.UserUtils; +import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController; /** * A validator for validating passwords (if they match with stored) *

* @author Roland Haeder */ -@FacesValidator (value = "UserPasswordValidator") -public class UserPasswordValidator extends BaseStringValidator implements Validator { +@FacesValidator (value = "JobsUserPasswordValidator") +public class JobsUserPasswordValidator extends BaseStringValidator implements Validator { /** * Serial number @@ -56,12 +56,12 @@ public class UserPasswordValidator extends BaseStringValidator implements Valida /** * User login controller */ - private UserLoginWebSessionController loginController; + private JobsUserLoginWebSessionController loginController; /** * Default constructor */ - public UserPasswordValidator () { + public JobsUserPasswordValidator () { // Try to get it try { // Get initial context diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 6ecb56af..8c82d2f9 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.jjobs.validators.password.UserPasswordValidator + JobsUserPasswordValidator + org.mxchange.jjobs.validators.password.JobsUserPasswordValidator * 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..35b3240a 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