Continued a bit:

- changed JNDI lookup to portable (long) version
- updated jar(s)

diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar
index 89275c5218b48c3842588289e939ade13098c570..fdf6c73fa2eb69e4712ec404e9017de768b943d5 100644 (file)
Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ

diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
index 818242f5bcc4c233b45ea5ce5a2537417c2b0dff..3b9972ab6f973335abc0d310502ccd81fc401802 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java
@@ -34,17 +34,17 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
 import org.mxchange.jjobs.events.addressbook.AddressbookLoadedEvent;
 import org.mxchange.jjobs.events.addressbook.LoadedAddressbookEvent;
 import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException;
 import org.mxchange.jjobs.exceptions.AddressbookNotFoundException;
 import org.mxchange.jjobs.model.addressbook.Addressbook;
-import org.mxchange.jjobs.model.addressbook.AddressbookSessionBeanRemote;
+import org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote;
 import org.mxchange.jjobs.model.addressbook.UserAddressbook;
 import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry;
 import org.mxchange.jusercore.events.login.UserLoggedInEvent;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.jjobs.beans.login.JobsUserLoginWebSessionController;
 
 /**
  * An address book bean (controller)
@@ -68,7 +68,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
        /**
         * Remote address book bean
         */
-       private AddressbookSessionBeanRemote addressbookBean;
+       private JobsAddressbookSessionBeanRemote addressbookBean;
 
        /**
         * When this address book has been created
@@ -118,7 +118,7 @@ public class JobsAddressbookWebSessionBean implements JobsAddressbookWebSessionC
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("ejb/stateless-jjobs-adr"); //NOI18N
+                       this.addressbookBean = (JobsAddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N
                } catch (final NamingException e) {
                        // Throw again
                        throw new FaceletException(e);

diff --git a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java
index 31cf9d7e351676672c3dea5f3cbe6a0299dc9afc..355d491adf987739dfc1d6016aede65d95916123 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java
+++ b/src/java/org/mxchange/jjobs/beans/country/JobsCountryWebApplicationBean.java
@@ -62,7 +62,7 @@ public class JobsCountryWebApplicationBean implements JobsCountryWebApplicationC
                        Context context = new InitialContext();
 
                        // Try to lookup the bean
-                       this.countryBean = (JobsCountrySingletonBeanRemote) context.lookup("ejb/jjobs-singleton-country"); //NOI18N
+                       this.countryBean = (JobsCountrySingletonBeanRemote) context.lookup("java:global/jjobs-ejb/country!org.mxchange.jcountry.data.JobsCountrySingletonBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);

diff --git a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
index dadf05c3d7fdd22994b2520266792ca739a7ae47..dcdba2e9434d5b7651c025b4fae80311c9e1ba8a 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/email_address/JobsEmailChangeWebSessionBean.java
@@ -84,7 +84,7 @@ public class JobsEmailChangeWebSessionBean implements JobsEmailChangeWebSessionC
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.emailBean = (EmailChangeSessionBeanRemote) context.lookup("ejb/stateless-jjobs-email-change"); //NOI18N
+                       this.emailBean = (EmailChangeSessionBeanRemote) context.lookup("java:global/jjobs-ejb/email-change!org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote"); //NOI18N
 
                        // Init list
                        this.emailAddresses = this.emailBean.allQueuedAddressesAsList();

diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
index aeaeaaac2c9decd4f5baa77de9d5186290ae5c86..97dd8ec573842d7da6ecce4538037031087a0d46 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java
@@ -103,7 +103,7 @@ public class JobsUserLoginWebSessionBean implements JobsUserLoginWebSessionContr
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.loginBean = (UserLoginSessionBeanRemote) context.lookup("ejb/stateless-jjobs-login"); //NOI18N
+                       this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/jjobs-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);

diff --git a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
index 675f0ef06f9a227022bc26bee5f127097a43acff..027c9654734bb4c1305e7a9c3cea2ada199292ad 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/register/JobsUserRegisterWebSessionBean.java
@@ -78,7 +78,7 @@ public class JobsUserRegisterWebSessionBean implements JobsUserRegisterWebSessio
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("ejb/stateless-jjobs-register"); //NOI18N
+                       this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/jjobs-ejb/register, java:global/jjobs-ejb/register!org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);

diff --git a/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java
index e43b28f426d0d037449aa77be215f7ec28c0a5ed..f8feebaea1f7a341475257623d532d02f6a3678b 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java
+++ b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jphone.phonenumbers.smsprovider.AddressbookSmsProviderSingletonBeanRemote;
+import org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote;
 import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
 
 /**
@@ -45,7 +45,7 @@ public class JobsSmsProviderWebApplicationBean implements JobsSmsProviderWebAppl
        /**
         * Remote country EJB
         */
-       private AddressbookSmsProviderSingletonBeanRemote cellphoneBean;
+       private JobsSmsProviderSingletonBeanRemote cellphoneBean;
 
        /**
         * List of all countries
@@ -62,7 +62,7 @@ public class JobsSmsProviderWebApplicationBean implements JobsSmsProviderWebAppl
                        Context context = new InitialContext();
 
                        // Try to lookup the bean
-                       this.cellphoneBean = (AddressbookSmsProviderSingletonBeanRemote) context.lookup("ejb/jjobs-singleton-smsprovider"); //NOI18N
+                       this.cellphoneBean = (JobsSmsProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw
                        throw new FaceletException(ex);

diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
index bc1ff54d866aa24a0500c0d8e93a713c4e6ae8e2..1c143ea40e83cc662dd55b3b0b77860e0ab2954c 100644 (file)
--- a/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/JobsUserWebSessionBean.java
@@ -231,7 +231,7 @@ public class JobsUserWebSessionBean implements JobsUserWebSessionController {
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.userBean = (UserSessionBeanRemote) context.lookup("ejb/stateless-jjobs-user"); //NOI18N
+                       this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
                } catch (final NamingException e) {
                        // Throw again
                        throw new FaceletException(e);

diff --git a/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java
index 48475937fec6b33870d7245032295ed93e66cad3..b54f9b08546b2b3d950dfe4e9c3d02238c49fb5b 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java
@@ -28,7 +28,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jcoreeelogger.beans.local.logger.Log;
 import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal;
-import org.mxchange.jphone.phonenumbers.smsprovider.AddressbookSmsProviderSingletonBeanRemote;
+import org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote;
 import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider;
 
 /**
@@ -48,7 +48,7 @@ public class JobsSmsProviderConverter implements Converter {
        /**
         * SMS provider bean
         */
-       private AddressbookSmsProviderSingletonBeanRemote providerController;
+       private JobsSmsProviderSingletonBeanRemote providerController;
 
        /**
         * Initialization of this converter
@@ -63,7 +63,7 @@ public class JobsSmsProviderConverter implements Converter {
                        this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
 
                        /// and SMS provider controller
-                       this.providerController = (AddressbookSmsProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.AddressbookSmsProviderSingletonBeanRemote"); //NOI18N
+                       this.providerController = (JobsSmsProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw it
                        throw new RuntimeException("context.lookup() failed.", ex); //NOI18N

diff --git a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java
index 7a10d8ddcb0e567311bb9c3e533afd01026182aa..840e01cf2a131f0db45bf46447ef199e20d8570d 100644 (file)
--- a/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/user/JobsUserConverter.java
@@ -65,7 +65,7 @@ public class JobsUserConverter implements Converter {
                        this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N
 
                        // ... and user controller
-                       this.userController = (JobsUserWebSessionController) context.lookup("java:global/juser-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
+                       this.userController = (JobsUserWebSessionController) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N
                } catch (final NamingException ex) {
                        // Continue to throw it
                        throw new RuntimeException("context.lookup() failed.", ex); //NOI18N