From 6952c05ddb7dc3685da62315b3c88473f173b9d6 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 9 Apr 2016 18:08:10 +0200 Subject: [PATCH] introduced new lib jphone-lib.jar which holds remote interfaces for jphone-core --- lib/jphone-lib.jar | Bin 0 -> 1622 bytes nbproject/build-impl.xml | 2 ++ nbproject/genfiles.properties | 6 +++--- nbproject/project.properties | 3 +++ nbproject/project.xml | 4 ++++ .../JobsSmsProviderWebApplicationBean.java | 6 +++--- .../smsprovider/JobsSmsProviderConverter.java | 6 +++--- 7 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 lib/jphone-lib.jar diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar new file mode 100644 index 0000000000000000000000000000000000000000..bdeff312e2b7e935c3c355e13294565acd4c0a3e GIT binary patch literal 1622 zcmbVM%Wl&^6upzAP2<)jLfOD76`NMbaX`F_kld;fRUQpZ=@w1gA(_Y?N48THcHJN$ zHhclA!UnNq!-5Z}#Fn2xh(D;fV<*NANocv!jP3Ec=RSOoo7Hqi0ayT7di(k@#4HCH zsBi5V+IFL&pPd3UBj_SRjd!13^${*t0apaA8;$MCR%@?RuhgmF&za|I`^@#YBOVlQ zl*+1Nh}enIr)HNG@eE(yFWpgrBh{Os;cjSHW-f?8U;e7m^1<5JUN z#ZAZUJ1+H+dQDYSC7EHY7Ayt8aXb2SggQjnM`o9b4x0g$DiaB$a@PeWnn1`Y8I9WEK|#hITN_Nx>oDaL#hvaZs|4d`RfF7E#48-AGnM_ z<1fI&+N3@wx)v`x7H<6!k}EA|;F_$$Eo8qIdpoHTnHqsBy942Ko9%Otw=HG};rPLT zd00S@{*lglZ9Oa>V^se)!wESM$OjFwZ~*n4c8{4pfkJS^9lga|PA&eDVqWtE2&8bO zvF{{9aKPvAX&#?aki~_9#ytn9Z9FBgDD_KHh4gf>BN8nSKMi?}^c+h6kLx7yO9yEu z$JcR>Tw}k2cyP%Oz=xX@XJ|6`H@pp{nv6NZ$g31XlBbp~HDw MfTt;dA95h!H>k&u?f?J) literal 0 HcmV?d00001 diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 226dc27e..0d03157f 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1037,6 +1037,7 @@ exists or setup the property manually. For example like this: + @@ -1051,6 +1052,7 @@ exists or setup the property manually. For example like this: + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 5eb7f85f..91ae2379 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=b9ff954e +build.xml.data.CRC32=358d2e1f build.xml.script.CRC32=fae72669 build.xml.stylesheet.CRC32=651128d4@1.75.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=b9ff954e -nbproject/build-impl.xml.script.CRC32=fca932bd +nbproject/build-impl.xml.data.CRC32=358d2e1f +nbproject/build-impl.xml.script.CRC32=9775b80c nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 6c837093..ab081227 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -42,6 +42,7 @@ file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcountry-core.jar=lib/jcountry-core.jar file.reference.jcountry-lib.jar=lib/jcountry-lib.jar file.reference.jphone-core.jar=lib/jphone-core.jar +file.reference.jphone-lib.jar=lib/jphone-lib.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar includes=** @@ -65,6 +66,7 @@ javac.classpath=\ ${file.reference.jcountry-core.jar}:\ ${file.reference.jcountry-lib.jar}:\ ${file.reference.jphone-core.jar}:\ + ${file.reference.jphone-lib.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ ${reference.jjobs-lib.jar} @@ -114,6 +116,7 @@ source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcountry-core.jar=../jcountry-core/src/ source.reference.jcountry-lib.jar=../jcountry-lib/src/ source.reference.jphone-core.jar=../jphone-core/src/ +source.reference.jphone-lib.jar=../jphone-lib/src/ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ source.root=src diff --git a/nbproject/project.xml b/nbproject/project.xml index 352befef..53d69873 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -34,6 +34,10 @@ ${file.reference.jphone-core.jar} WEB-INF/lib + + ${file.reference.jphone-lib.jar} + WEB-INF/lib + ${file.reference.juser-core.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java index f8feebae..2314b22f 100644 --- a/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/smsprovider/JobsSmsProviderWebApplicationBean.java @@ -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.JobsSmsProviderSingletonBeanRemote; import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; +import org.mxchange.jphone.phonenumbers.smsprovider.SmsProviderSingletonBeanRemote; /** * A SMS provider bean @@ -45,7 +45,7 @@ public class JobsSmsProviderWebApplicationBean implements JobsSmsProviderWebAppl /** * Remote country EJB */ - private JobsSmsProviderSingletonBeanRemote cellphoneBean; + private SmsProviderSingletonBeanRemote 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 = (JobsSmsProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote"); //NOI18N + this.cellphoneBean = (SmsProviderSingletonBeanRemote) 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/converter/smsprovider/JobsSmsProviderConverter.java b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java index b54f9b08..543b7f1d 100644 --- a/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java +++ b/src/java/org/mxchange/jjobs/converter/smsprovider/JobsSmsProviderConverter.java @@ -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.JobsSmsProviderSingletonBeanRemote; import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; +import org.mxchange.jphone.phonenumbers.smsprovider.SmsProviderSingletonBeanRemote; /** * Converter for SMS provider instance @@ -48,7 +48,7 @@ public class JobsSmsProviderConverter implements Converter { /** * SMS provider bean */ - private JobsSmsProviderSingletonBeanRemote providerController; + private SmsProviderSingletonBeanRemote 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 = (JobsSmsProviderSingletonBeanRemote) context.lookup("java:global/jjobs-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote"); //NOI18N + this.providerController = (SmsProviderSingletonBeanRemote) 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 -- 2.39.5