From e01fb2d2c5c747f1e8408313491e4cc62e54ac1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 16 Aug 2016 17:25:36 +0200 Subject: [PATCH] Please cherry-pick: - renamed as this is for users (and not any other entities with email-change functionality) - added missing i18n string MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AddressbookAdminMobileProviderSessionBean.java | 2 +- .../AddressbookMobileProviderSingletonBean.java | 5 +++++ ...Bean.java => AddressbookUserEmailChangeSessionBean.java} | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) rename src/java/org/mxchange/jusercore/model/email_address/{AddressbookEmailChangeSessionBean.java => AddressbookUserEmailChangeSessionBean.java} (97%) diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java index cb7339c..5e342c3 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookAdminMobileProviderSessionBean.java @@ -27,7 +27,7 @@ import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException; *

* @author Roland Haeder */ -@Stateless (name = "adminmobileprovider", description = "A singleton session bean for mobile provider informations, admin-edition") +@Stateless (name = "adminMobileProvider", description = "A singleton session bean for mobile provider informations, admin-edition") public class AddressbookAdminMobileProviderSessionBean extends BaseDatabaseBean implements AdminMobileProviderSessionBeanRemote { /** diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java index 28b118d..1875fe4 100644 --- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java +++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java @@ -29,8 +29,13 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean; * @author Roland Haeder */ @Startup +<<<<<<< HEAD:src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java @Singleton (name = "mobileprovider", description = "A singleton session bean for SMS provider informations") public class AddressbookMobileProviderSingletonBean extends BaseDatabaseBean implements MobileProviderSingletonBeanRemote { +======= +@Singleton (name = "mobileProvider", description = "A singleton session bean for SMS provider informations") +public class LandingMobileProviderSingletonBean extends BaseLandingDatabaseBean implements MobileProviderSingletonBeanRemote { +>>>>>>> 3b7cccf... Please cherry-pick::src/java/org/mxchange/jphone/phonenumbers/mobileprovider/LandingMobileProviderSingletonBean.java /** * Serial number diff --git a/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/email_address/AddressbookUserEmailChangeSessionBean.java similarity index 97% rename from src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java rename to src/java/org/mxchange/jusercore/model/email_address/AddressbookUserEmailChangeSessionBean.java index 503b7ed..06419b9 100644 --- a/src/java/org/mxchange/jusercore/model/email_address/AddressbookEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/email_address/AddressbookUserEmailChangeSessionBean.java @@ -36,8 +36,8 @@ import org.mxchange.jusercore.model.user.UserUtils; *

* @author Roland Haeder */ -@Stateless (name = "emailchange", description = "A bean handling email changes") -public class AddressbookEmailChangeSessionBean extends BaseAddressbookDatabaseBean implements EmailChangeSessionBeanRemote { +@Stateless (name = "userEmailChange", description = "A bean handling user email changes") +public class AddressbookUserEmailChangeSessionBean extends BaseAddressbookDatabaseBean implements EmailChangeSessionBeanRemote { /** * Serial number @@ -53,7 +53,7 @@ public class AddressbookEmailChangeSessionBean extends BaseAddressbookDatabaseBe /** * Default constructor */ - public AddressbookEmailChangeSessionBean () { + public AddressbookUserEmailChangeSessionBean () { } @Override -- 2.39.2