From: Roland Haeder Date: Sat, 9 Apr 2016 16:09:15 +0000 (+0200) Subject: introduced new lib jphone-lib.jar which holds remote interfaces for jphone-core ... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c0b86d4235b1ae3aa5f42c5919badc670b6d7641;p=addressbook-war.git introduced new lib jphone-lib.jar which holds remote interfaces for jphone-core + added jcountry-lib (new dependency) --- diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar new file mode 100644 index 00000000..f8f305c8 Binary files /dev/null and b/lib/jcountry-lib.jar differ diff --git a/lib/jphone-lib.jar b/lib/jphone-lib.jar new file mode 100644 index 00000000..bdeff312 Binary files /dev/null and b/lib/jphone-lib.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 3240e969..5da0442b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1034,10 +1034,12 @@ exists or setup the property manually. For example like this: + + @@ -1051,10 +1053,12 @@ exists or setup the property manually. For example like this: + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 0d51428f..059e142e 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.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=794ded5f -nbproject/build-impl.xml.script.CRC32=e6d84652 +nbproject/build-impl.xml.data.CRC32=fcedbfb0 +nbproject/build-impl.xml.script.CRC32=a3559915 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 43575f9e..ad4ac302 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -44,7 +44,9 @@ file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcore.jar=lib/jcore.jar 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,10 +67,12 @@ javac.classpath=\ ${file.reference.jcoreee.jar}:\ ${file.reference.jcore-logger-lib.jar}:\ ${file.reference.jcountry-core.jar}:\ + ${file.reference.jcountry-lib.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-lib.jar}:\ ${file.reference.jphone-core.jar}:\ + ${file.reference.jphone-lib.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ ${reference.addressbook-lib.jar}:\ @@ -120,7 +124,9 @@ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcore.jar=../jcore/src/ 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 75f2f1bb..9c2e898a 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -22,6 +22,10 @@ ${file.reference.jcountry-core.jar} WEB-INF/lib + + ${file.reference.jcountry-lib.jar} + WEB-INF/lib + ${file.reference.jcontacts-core.jar} WEB-INF/lib @@ -38,6 +42,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/addressbook/beans/country/AddressbookCountryWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java index 79395cd0..fea765fd 100644 --- a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java @@ -25,8 +25,8 @@ import javax.inject.Named; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote; import org.mxchange.jcountry.data.Country; +import org.mxchange.jcountry.data.CountrySingletonBeanRemote; /** * A country bean @@ -45,7 +45,7 @@ public class AddressbookCountryWebApplicationBean implements AddressbookCountryW /** * Remote country EJB */ - private AddressbookCountrySingletonBeanRemote countryBean; + private CountrySingletonBeanRemote countryBean; /** * List of all countries @@ -62,7 +62,7 @@ public class AddressbookCountryWebApplicationBean implements AddressbookCountryW Context context = new InitialContext(); // Try to lookup the bean - this.countryBean = (AddressbookCountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote"); //NOI18N + this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //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 4b8faa2b..ac6010e3 100644 --- a/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.java +++ b/src/java/org/mxchange/addressbook/beans/smsprovider/AddressbookSmsProviderWebApplicationBean.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.AddressbookSmsProviderSingletonBeanRemote; import org.mxchange.jphone.phonenumbers.smsprovider.SmsProvider; +import org.mxchange.jphone.phonenumbers.smsprovider.SmsProviderSingletonBeanRemote; /** * A SMS provider bean @@ -45,7 +45,7 @@ public class AddressbookSmsProviderWebApplicationBean implements AddressbookSmsP /** * Remote country EJB */ - private AddressbookSmsProviderSingletonBeanRemote cellphoneBean; + private SmsProviderSingletonBeanRemote cellphoneBean; /** * List of all countries @@ -62,7 +62,7 @@ public class AddressbookSmsProviderWebApplicationBean implements AddressbookSmsP Context context = new InitialContext(); // Try to lookup the bean - this.cellphoneBean = (AddressbookSmsProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.JobsSmsProviderSingletonBeanRemote"); //NOI18N + this.cellphoneBean = (SmsProviderSingletonBeanRemote) 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/converter/country/AddressbookCountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java index 3bae345e..5c5850ca 100644 --- a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java +++ b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.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.jcountry.data.AddressbookCountrySingletonBeanRemote; import org.mxchange.jcountry.data.Country; +import org.mxchange.jcountry.data.CountrySingletonBeanRemote; /** * Converter for country instance @@ -42,7 +42,7 @@ public class AddressbookCountryConverter implements Converter { /** * Country bean */ - private AddressbookCountrySingletonBeanRemote countryBean; + private CountrySingletonBeanRemote countryBean; /** * Logger instance @@ -63,7 +63,7 @@ public class AddressbookCountryConverter implements Converter { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and country bean - this.countryBean = (AddressbookCountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.AddressbookCountrySingletonBeanRemote"); //NOI18N + this.countryBean = (CountrySingletonBeanRemote) context.lookup("java:global/addressbook-ejb/country!org.mxchange.jcountry.data.CountrySingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException("context.lookup() failed.", ex); //NOI18N diff --git a/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java b/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java index 737b1808..4b516d4e 100644 --- a/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.java +++ b/src/java/org/mxchange/addressbook/converter/smsprovider/AddressbookSmsProviderConverter.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.AddressbookSmsProviderSingletonBeanRemote; 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 AddressbookSmsProviderConverter implements Converter { /** * SMS provider bean */ - private AddressbookSmsProviderSingletonBeanRemote providerController; + private SmsProviderSingletonBeanRemote providerController; /** * Initialization of this converter @@ -63,7 +63,7 @@ public class AddressbookSmsProviderConverter 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/addressbook-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.AddressbookSmsProviderSingletonBeanRemote"); //NOI18N + this.providerController = (SmsProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/smsprovider!org.mxchange.jphone.phonenumbers.smsprovider.AddressbookSmsProviderSingletonBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException("context.lookup() failed.", ex); //NOI18N