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 <roland@mxchange.org>

diff --git a/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/JobsAdminContactPhoneSessionBean.java
index a2913367f1f1af7b15699980c6f0a03e8af91f1f..8450069ba61a07ca8b10c8340bd6262ad471b579 100644 (file)
--- 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 2829dd3f901f02fca5d3abd6a4c5cc0cde0d73ca..6837702ea44e53b6b440e84893602d870bc03737 100644 (file)
--- 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 ae6208c9b61ee04014563742b074aef9efc98c88..84ece40ddbff12f67e60510099ad8ba4469a96eb 100644 (file)
--- 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 6e709dc6b2dd192cdf577faebde0f25c04a65ff5..7d102f3b49795f12906a5b8b7bb58bf4b26aea7c 100644 (file)
--- 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 cbd6fce2858c0455cdf1941e47e81076814035bd..94ec33421b8d24d6093eeb71aa1c56eb2e650b08 100644 (file)
--- 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 b3990a731163d66f2335bc8ae4f7b93019f7a65f..0547ee55bc5802115d7c057993d0257d7b5fab65 100644 (file)
--- 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 c8cbe59a407fe02c6e756513ceba3551b551efd4..21187c5206b4ca80b8ebe8cc683b7dd7d716ad5a 100644 (file)
--- 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 de290829aea6228e184235d80985bd133ae77c86..a7f2e755084da393fe0529a0b727413be0d2ecd0 100644 (file)
--- 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 2b685560e79c3c579a9a76033d53c01b3f997104..743bab681663c5b644b6f7f838fa7f41de2c98b8 100644 (file)
--- 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 d32317d259281096ec489eaf7ac763775980f203..00803deeabd776a963e50ba50587770e6011476a 100644 (file)
--- 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;
 
        /**