From: Roland Häder Date: Sat, 23 Sep 2017 12:06:24 +0000 (+0200) Subject: Please repeat/cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=81379f1fa29a892f1e3e7feeef9c348d41d13ad3;p=addressbook-ejb.git Please repeat/cherry-pick: - added lookup attribute to @EJB annotation as some lookup did not work as expected and this is "guranteed" to work (if you have the right JNDI name, of course) - plus all these EJBs can now be more distributed over separate EJB modules allowing a distributed operation over several data centers, awsome words, right? ;-) - sorted members in base database bean Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java index d59d5a6..5aa2b83 100644 --- a/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java @@ -46,7 +46,7 @@ public class AddressbookAdminContactPhoneSessionBean extends BaseAddressbookEnte /** * Contact EJB */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java index 05d7adb..a391b95 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/AddressbookAdminBusinessDataSessionBean.java @@ -44,7 +44,7 @@ public class AddressbookAdminBusinessDataSessionBean extends BaseAddressbookEnte /** * Administrative EJB */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote") private BasicCompanyDataSessionBeanRemote businessDataBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java index 3fc9ba6..331e988 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/AddressbookAdminBranchOfficeSessionBean.java @@ -44,7 +44,7 @@ public class AddressbookAdminBranchOfficeSessionBean extends BaseAddressbookEnte /** * General branch office bean */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote") private BranchOfficeSessionBeanRemote branchOfficeBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java index 3de16e2..c89bf4e 100644 --- a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java @@ -59,7 +59,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im /** * Registration EJB */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") private UserRegistrationSessionBeanRemote registerBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/AddressbookUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/AddressbookUserEmailChangeSessionBean.java index 0b3bec7..6bc4100 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/AddressbookUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/AddressbookUserEmailChangeSessionBean.java @@ -46,7 +46,7 @@ public class AddressbookUserEmailChangeSessionBean extends BaseAddressbookEnterp /** * User bean */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -111,7 +111,6 @@ public class AddressbookUserEmailChangeSessionBean extends BaseAddressbookEnterp // Persist it //@TODO Fix email delivery then allow this: this.getEntityManager().persist(emailChange); - // Send email this.sendEmail("User email change", "user_email_change", emailChange.getEmailChangeUser(), baseUrl, null); //NOI18N diff --git a/src/java/org/mxchange/juserlogincore/model/user/resendlink/AddressbookResendLinkSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/resendlink/AddressbookResendLinkSessionBean.java index e8bbba6..126c86f 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/resendlink/AddressbookResendLinkSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/resendlink/AddressbookResendLinkSessionBean.java @@ -46,13 +46,13 @@ public class AddressbookResendLinkSessionBean extends BaseAddressbookEnterpriseB /** * Registration bean */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") private UserRegistrationSessionBeanRemote registerBean; /** * Regular user bean */ - @EJB + @EJB (lookup = "java:global/addressbook-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /**