From 15157362b596b2ec4d7a7be1c63342a3e7eeb2c4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 5 Apr 2016 14:20:05 +0200 Subject: [PATCH] Continued a bit: - changed JNDI lookup to portable (long) version - updated jar(s) --- lib/juser-lib.jar | Bin 5111 -> 5111 bytes .../AddressbookWebSessionBean.java | 4 ++-- .../AddressbookCountryWebApplicationBean.java | 2 +- .../AddressbookEmailChangeWebSessionBean.java | 2 +- .../AddressbookUserLoginWebSessionBean.java | 2 +- ...AddressbookUserRegisterWebSessionBean.java | 4 ++-- ...ressbookSmsProviderWebApplicationBean.java | 2 +- .../user/AddressbookUserWebSessionBean.java | 2 +- .../user/AddressbookUserConverter.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index 89275c5218b48c3842588289e939ade13098c570..fdf6c73fa2eb69e4712ec404e9017de768b943d5 100644 GIT binary patch delta 238 zcmeya{#~6nz?+$ci-CcIf#F6`>qK4+=IcPpVm`BDcI(7j@?h$Z28f!h&S(UtV;C*K z^mIlykmAV?812BcB9kLnJeA27L~mZow1EjEu{na3ml@2+;9zG4OBHcHWM&51H#v;o z0<3o;zdcy*Wqy4y%_;z~!$H6a%x@L&0Mi!)!ocb^1^vKum0%!P{G6aKn3fZ&0E^EQ O$^+9}!W9tx!bJez<5I!^ delta 238 zcmeya{#~6nz?+$ci-CcIfnnpcmWjL?%o~7|#e6VzOCC)90Siu6XEXwFC&w^afa&Rs zZeaQWqaB!5WO4-4sZ6#Ydh=4I4NPE01S>Byn32K34q+5=KV)VG+BZ3jA7a)-etWRq z%l!IanpFTI?jYa<=C=xXfawbYVPINQ&<{*k2?m1cbArBLT280}OwSa`1Jhi>5Pqw0 F5da~0Tp|Df diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java index a1bd778d..98dcbc9f 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebSessionBean.java @@ -36,6 +36,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; import org.mxchange.addressbook.events.addressbook.AddressbookLoadedEvent; import org.mxchange.addressbook.events.addressbook.LoadedAddressbookEvent; import org.mxchange.addressbook.exceptions.AddressbookNameAlreadyUsedException; @@ -46,7 +47,6 @@ import org.mxchange.addressbook.model.addressbook.UserAddressbook; import org.mxchange.addressbook.model.addressbook.entry.AddressbookEntry; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.model.user.User; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * An address book bean (controller) @@ -125,7 +125,7 @@ public class AddressbookWebSessionBean implements AddressbookWebSessionControlle Context context = new InitialContext(); // Try to lookup - this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("ejb/stateless-addressbook-adr"); //NOI18N + this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw again throw new FaceletException(e); diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java index 0aa2bd18..79395cd0 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java @@ -62,7 +62,7 @@ public class AddressbookCountryWebApplicationBean implements AddressbookCountryW Context context = new InitialContext(); // Try to lookup the bean - this.countryBean = (AddressbookCountrySingletonBeanRemote) context.lookup("ejb/addressbook-singleton-country"); //NOI18N + this.countryBean = (AddressbookCountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java index 7f4f1b04..9a379e7d 100644 --- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java @@ -84,7 +84,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha Context context = new InitialContext(); // Try to lookup - this.emailBean = (EmailChangeSessionBeanRemote) context.lookup("ejb/stateless-addressbook-email-change"); //NOI18N + this.emailBean = (EmailChangeSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java index fa65e6a4..ae742ceb 100644 --- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java @@ -103,7 +103,7 @@ public class AddressbookUserLoginWebSessionBean implements AddressbookUserLoginW Context context = new InitialContext(); // Try to lookup - this.loginBean = (UserLoginSessionBeanRemote) context.lookup("ejb/stateless-addressbook-login"); //NOI18N + this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java index 74cd5f35..faf748fd 100644 --- a/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/register/AddressbookUserRegisterWebSessionBean.java @@ -26,6 +26,7 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; import org.mxchange.jusercore.events.registration.RegisteredUserEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; @@ -35,7 +36,6 @@ import org.mxchange.jusercore.model.register.UserRegistrationSessionBeanRemote; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserUtils; import org.mxchange.jusercore.model.user.status.UserAccountStatus; -import org.mxchange.addressbook.beans.user.AddressbookUserWebSessionController; /** * A web bean for user registration @@ -78,7 +78,7 @@ public class AddressbookUserRegisterWebSessionBean implements AddressbookUserReg Context context = new InitialContext(); // Try to lookup - this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("ejb/stateless-addressbook-register"); //NOI18N + this.registerBean = (UserRegistrationSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java index cb7e5d86..4b8faa2b 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java @@ -62,7 +62,7 @@ public class AddressbookSmsProviderWebApplicationBean implements AddressbookSmsP Context context = new InitialContext(); // Try to lookup the bean - this.cellphoneBean = (AddressbookSmsProviderSingletonBeanRemote) context.lookup("ejb/addressbook-singleton-smsprovider"); //NOI18N + this.cellphoneBean = (AddressbookSmsProviderSingletonBeanRemote) context.lookup("java:global/addressbook-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/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index 89dc6416..e6806af6 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -241,7 +241,7 @@ public class AddressbookUserWebSessionBean implements AddressbookUserWebSessionC Context context = new InitialContext(); // Try to lookup - this.userBean = (UserSessionBeanRemote) context.lookup("ejb/stateless-addressbook-user"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/addressbook-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/addressbook/converter/user/AddressbookUserConverter.java b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java index 9ad4e833..8efffe1b 100644 --- a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java +++ b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java @@ -63,7 +63,7 @@ public class AddressbookUserConverter 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 = (AddressbookUserWebSessionController) context.lookup("java:global/juser-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userController = (AddressbookUserWebSessionController) context.lookup("java:global/addressbook-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 -- 2.39.5