From 31309403fd24c4c54920480db284da56a6de7c0e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 23 Sep 2017 14:06:24 +0200 Subject: [PATCH] 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../model/phone/JobsAdminContactPhoneSessionBean.java | 2 +- .../model/basicdata/JobsAdminBusinessDataSessionBean.java | 2 +- .../model/branchoffice/JobsAdminBranchOfficeSessionBean.java | 2 +- .../jusercore/model/user/JobsAdminUserSessionBean.java | 2 +- .../mxchange/jusercore/model/user/JobsUserSessionBean.java | 2 +- .../model/user/activity/JobsUserActivityLogMessageBean.java | 2 +- .../user/email_address/JobsUserEmailChangeSessionBean.java | 3 +-- .../model/user/login/JobsUserLoginSessionBean.java | 2 +- .../model/user/register/JobsUserRegistrationSessionBean.java | 4 ++-- .../model/user/resendlink/JobsResendLinkSessionBean.java | 4 ++-- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java index a291336..8450069 100644 --- a/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java +++ b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java @@ -46,7 +46,7 @@ public class JobsAdminContactPhoneSessionBean extends BaseJobsEnterpriseBean imp /** * Contact EJB */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/contact!org.mxchange.jcontacts.model.contact.ContactSessionBeanRemote") private ContactSessionBeanRemote contactBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java index 2829dd3..6837702 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/JobsAdminBusinessDataSessionBean.java @@ -44,7 +44,7 @@ public class JobsAdminBusinessDataSessionBean extends BaseJobsEnterpriseBean imp /** * Administrative EJB */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote") private BasicCompanyDataSessionBeanRemote businessDataBean; /** diff --git a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java index ae6208c..84ece40 100644 --- a/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java +++ b/src/java/org/mxchange/jcontactsbusiness/model/branchoffice/JobsAdminBranchOfficeSessionBean.java @@ -44,7 +44,7 @@ public class JobsAdminBranchOfficeSessionBean extends BaseJobsEnterpriseBean imp /** * General branch office bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/branchOffice!org.mxchange.jcontactsbusiness.model.branchoffice.BranchOfficeSessionBeanRemote") private BranchOfficeSessionBeanRemote branchOfficeBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java index 6e709dc..7d102f3 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsAdminUserSessionBean.java @@ -46,7 +46,7 @@ public class JobsAdminUserSessionBean extends BaseJobsEnterpriseBean implements /** * Regular user bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java index cbd6fce..94ec334 100644 --- a/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/JobsUserSessionBean.java @@ -58,7 +58,7 @@ public class JobsUserSessionBean extends BaseJobsEnterpriseBean implements UserS /** * Registration EJB */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") private UserRegistrationSessionBeanRemote registerBean; /** diff --git a/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java b/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java index b3990a7..0547ee5 100644 --- a/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java +++ b/src/java/org/mxchange/jusercore/model/user/activity/JobsUserActivityLogMessageBean.java @@ -38,7 +38,7 @@ import org.mxchange.jusercore.model.user.User; activationConfig = { @ActivationConfigProperty ( propertyName = "destinationLookup", - propertyValue = "jms/jfinancials-user-activity-log" + propertyValue = "jms/jjobs-user-activity-log" ), @ActivationConfigProperty ( propertyName = "destinationType", diff --git a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java index c8cbe59..21187c5 100644 --- a/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java +++ b/src/java/org/mxchange/jusercore/model/user/email_address/JobsUserEmailChangeSessionBean.java @@ -46,7 +46,7 @@ public class JobsUserEmailChangeSessionBean extends BaseJobsEnterpriseBean imple /** * User bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** @@ -114,7 +114,6 @@ public class JobsUserEmailChangeSessionBean extends BaseJobsEnterpriseBean imple // 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/login/JobsUserLoginSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java index de29082..a7f2e75 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/login/JobsUserLoginSessionBean.java @@ -46,7 +46,7 @@ public class JobsUserLoginSessionBean extends BaseJobsEnterpriseBean implements /** * User EJB */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** diff --git a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java index 2b68556..743bab6 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/register/JobsUserRegistrationSessionBean.java @@ -48,13 +48,13 @@ public class JobsUserRegistrationSessionBean extends BaseJobsEnterpriseBean impl /** * Administrative user bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/adminUser!org.mxchange.jusercore.model.user.AdminUserSessionBeanRemote") private AdminUserSessionBeanRemote adminUserBean; /** * Regular user EJB */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** diff --git a/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java index d32317d..00803de 100644 --- a/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java +++ b/src/java/org/mxchange/juserlogincore/model/user/resendlink/JobsResendLinkSessionBean.java @@ -46,13 +46,13 @@ public class JobsResendLinkSessionBean extends BaseJobsEnterpriseBean implements /** * Registration bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/userRegistration!org.mxchange.juserlogincore.model.user.register.UserRegistrationSessionBeanRemote") private UserRegistrationSessionBeanRemote registerBean; /** * Regular user bean */ - @EJB + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** -- 2.39.5