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/AddressbookAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/AddressbookAdminContactPhoneSessionBean.java
index d59d5a693c89a6c8a6a5ed67562b03435bcc1b34..5aa2b8361f4a3330107302f28eaacfb2d244d9b8 100644 (file)
--- 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 05d7adb13ab44992da0cbc8dcdd5b4da193bc810..a391b95f0194d3f9841a82efac6930dbf8337f40 100644 (file)
--- 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 3fc9ba613e00db2b172eebf1488ab95901616bfe..331e988bcc65b64de9eea3dc31adcca1faf5fc46 100644 (file)
--- 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 3de16e24f79282ee4c19d1eb932091450b02e35e..c89bf4e161831934ffd7678acfe23d7478d22be8 100644 (file)
--- 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 0b3bec75195490aad8686d65c3e7dbde3fe43c0c..6bc41003e52f8415a5b7aa2f34a8a128f65dd9ce 100644 (file)
--- 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 e8bbba6cad99ab57e4cfad6c516502a181baf36b..126c86f579fddb3ef2295098be9d35dff65f5c74 100644 (file)
--- 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;
 
        /**