From 8d5aa49e25bce23bd7ee1efa1b834f5199ddf5a5 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 12 Apr 2016 20:31:08 +0200 Subject: [PATCH] Renamed package smsprovider -> mobileprovider. They don't only provide SMS but also many other mobile services. --- lib/jphone-core.jar | Bin 24411 -> 24465 bytes lib/jphone-lib.jar | Bin 1640 -> 1658 bytes ...sbookMobileProviderWebApplicationBean.java | 8 ++++---- ...obileProviderWebApplicationController.java | 5 +++-- .../AddressbookAdminUserWebSessionBean.java | 2 +- ...ressbookAdminUserWebSessionController.java | 2 +- .../user/AddressbookUserWebSessionBean.java | 4 ++-- .../AddressbookUserWebSessionController.java | 2 +- .../AddressbookMobileProviderConverter.java | 8 ++++---- 9 files changed, 16 insertions(+), 15 deletions(-) rename src/java/org/mxchange/addressbook/beans/{smsprovider => mobileprovider}/AddressbookMobileProviderWebApplicationBean.java (86%) rename src/java/org/mxchange/addressbook/beans/{smsprovider => mobileprovider}/AddressbookMobileProviderWebApplicationController.java (89%) rename src/java/org/mxchange/addressbook/converter/{smsprovider => mobileprovider}/AddressbookMobileProviderConverter.java (92%) diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index ec8a9b92f168dd26cce8f8c0540926ee0f2da933..251994eaf3dd85f7259513182d6c19f1c439444e 100644 GIT binary patch delta 997 zcmcb;k8$FDMxFp~W)?061`Y-W$CVR#G?^S$PBdS@WW93YO$8A7TN6l5R%0{(Q4x%` zAZj|JJBWI~=m?^encM`eSN3=?AOVBPj&>?+x%o+%IjNHuG6{p!ZDXq$caJ&th~&7W9vk z+RVX`%fuKwIYCkxrgS2Y#O5trv5d@48k)$eA4(VkwIdX6p2)L+n-}Ev3*KkkJ(w66 zJSN*oR1?xRc_NR@=1|ENMv!-IOYH>H(`2^tgZREWcffpYJyrp*H-+XF3ib#vFo3W- za!Zht|;2w}4RtLGTGC8iC{4v}Tm>eeSL^uFN zC+9_g)4+lVOAzliL{K);7sShn3M{|Qsi?6ZBIXzlP0pvH7c7jAt0!0_e zfJOOYr9mRvu`*1NI$+%mI;xX%qj^B0^MRt~dSKB9v6^7lqND;8%kAty3Sn{MAEyIW qkBB)21{W0d`u@o355|G>=bJbgrZYi62~fxxa%HnKFbG6|v;hF1&@Cze delta 977 zcmaJG}LbR&Ug5mXTC zy)en)cOfJZ-F$T+m3AG3P!|<-QFPH&KNe&mROdaq+85CW=N#VWyw7`{_j}&T3Vpdu zEdvKNS`#5gLaK7b;%9SmWuMGKa^-~w_YFVap_T5%BTFN!D#Hv-Vf30N@bIx7TUEZC zCUsvBKGI!|@ss1DW2a7^I5sl2=g%{ovc$riseEN`n4o4BBTs+Y2*DLcD$HA*FzaZ9 zkp2OUK*igl;l&{1bU=q;4%YNOjFol61x5#8%_Ks+Rvwy)R1@3nS8VTMfBvoTG3(EBt-TK^_@%0_@H8 zVdiXZ2*J;}3?2vahyUUBt$c?|?KWjQG@E0^NgH{I-DD6iw?MdH#xm)G#NILZM12s{ zHNZ^4?!g&S4MN>KElfSqiDaCMiDA1(WgWM#e)<-s+8kTSCTKP{ApzgKGAyxG7r$u( zNwVRah<@kjMM6`#>7iP%;7y?@u|xnXT@AY7UQwj4a?sr_%3Di*AzJ0ON_1-! x6NQy$O93HT<(n$m*#A3u(?+`+yF7nqG4ftZ2(C^QVIE@TwCSjUkhep4@e601CKdny diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar index 2fc3981fc2bb4825116a152cda7739fc56fc61f8..874d4e7abe6d53a399310fca0cc7c4f8fcbe9b41 100644 GIT binary patch delta 345 zcmaFC^NWWkz?+$ci-CcIfx%_vL>^5h=am!97ckkboOn|KME=$Ul9SaK4M0=`qphIr z${r5}Bw#T4BcqB|Zhlf`PHI6>epzNpYLPy|P>}Lf*7XKE7#SEqI2@#$4WfLq1XC4b z$mGdPCNP0hOwEjell_<#VFD6NT9fB6XEC{~oXo*u33S|KXBG#LQ(9TTF4_(h1oA#X z1Wj0dXaJ%j7;S|n zF6i-KKmxi9ljB&GHHveK3ySi~GE-8E^btma6vt*J_-tZiU;yC|uwrJQ;>mJMRg8g? zXEK>UdE%2_G37A&O-^7{1dG%$Phq;fV6q5{CD2Ke{aGA94w%RScE@3$AdvSDBIv;C zD~RE$$@5r^%uyZ1$RxrH@hPUW5FT36cx`els|wUr24Vr;tZX1z4j_zRVqo~i4B`O* DQ7}{i diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationBean.java similarity index 86% rename from src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationBean.java rename to src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationBean.java index f2536ce2..9211957a 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.smsprovider; +package org.mxchange.addressbook.beans.mobileprovider; import java.util.Collections; import java.util.List; @@ -25,8 +25,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; /** * A SMS provider bean @@ -62,7 +62,7 @@ public class AddressbookMobileProviderWebApplicationBean implements AddressbookM Context context = new InitialContext(); // Try to lookup the bean - this.cellphoneBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote"); //NOI18N + this.cellphoneBean = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/MobileProvider!org.mxchange.jphone.phonenumbers.MobileProvider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw throw new FaceletException(ex); diff --git a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationController.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationController.java similarity index 89% rename from src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationController.java rename to src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationController.java index 0041b71f..6e48565a 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookMobileProviderWebApplicationController.java +++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookMobileProviderWebApplicationController.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.beans.smsprovider; +package org.mxchange.addressbook.beans.mobileprovider; import java.io.Serializable; import java.util.List; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; /** * An interface for country beans @@ -33,4 +33,5 @@ public interface AddressbookMobileProviderWebApplicationController extends Seria * @return All countries */ List allMobileProvider (); + } diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionBean.java index 153617d4..8b40d30c 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionBean.java @@ -39,7 +39,7 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNotFoundException; diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionController.java index 99197044..e5cd9c12 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebSessionController.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.exceptions.UserNotFoundException; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java index ea5cb658..a95e0607 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionBean.java @@ -31,6 +31,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.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; @@ -41,7 +42,7 @@ import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; import org.mxchange.jphone.phonenumbers.fax.FaxNumber; import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jphone.phonenumbers.landline.LandLineNumber; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -49,7 +50,6 @@ import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; -import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController; /** * A user bean (controller) diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java index 7ea78ad2..769c8795 100644 --- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java +++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebSessionController.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.List; import org.mxchange.jcontacts.contact.gender.Gender; import org.mxchange.jcountry.data.Country; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.events.login.UserLoggedInEvent; import org.mxchange.jusercore.events.registration.UserRegisteredEvent; import org.mxchange.jusercore.exceptions.UserNotFoundException; diff --git a/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java similarity index 92% rename from src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookMobileProviderConverter.java rename to src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java index 1c4861cd..3259ba10 100644 --- a/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookMobileProviderConverter.java +++ b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.addressbook.converter.smsprovider; +package org.mxchange.addressbook.converter.mobileprovider; import java.text.MessageFormat; import java.util.List; @@ -28,8 +28,8 @@ 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.MobileProvider; -import org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider; +import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote; /** * Converter for SMS provider instance @@ -63,7 +63,7 @@ public class AddressbookMobileProviderConverter 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 = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.MobileProviderSingletonBeanRemote"); //NOI18N + this.providerController = (MobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/MobileProvider!org.mxchange.jphone.phonenumbers.MobileProvider.MobileProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N -- 2.39.5