introduced new lib jphone-lib.jar which holds remote interfaces for jphone-core ...

diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
new file mode 100644 (file)
index 0000000..f8f305c
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 (file)
index 0000000..bdeff31
Binary files /dev/null and b/lib/jphone-lib.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 3240e9692b48ecf251fb4d1953eaf72117657fca..5da0442b1cace891ba760b31364a6bb68f6bebba 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1034,10 +1034,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcountry-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jphone-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1051,10 +1053,12 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 0d51428f308ec8eeec3eb6101a95af2fa4892239..059e142e77967d0382942fee0b34ae55d4c9406f 100644 (file)
--- 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 43575f9edfa6353d64177b60235a360b9677886a..ad4ac30257f292868e8e840688a543e3b2bff663 100644 (file)
--- 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 75f2f1bb8d12c3b6cfad86a16bdbda570ddeda94..9c2e898ae50184e366ca65d2370431851cdec9b6 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -22,6 +22,10 @@
                     <file>${file.reference.jcountry-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jcountry-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.jcontacts-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -38,6 +42,10 @@
                     <file>${file.reference.jphone-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.jphone-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
                 <library dirs="200">
                     <file>${file.reference.juser-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>

diff --git a/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java b/src/java/org/mxchange/addressbook/beans/country/AddressbookCountryWebApplicationBean.java
index 79395cd0629cc03ee79f54c94e832b49b9e4bf6e..fea765fdbe163eccdfdbc0384ecf29772b4c095f 100644 (file)
--- 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 4b8faa2ba88e7c57363675e8e00e29e841edd366..ac6010e3de838235628856e10377b6ae9d32a856 100644 (file)
--- 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 3bae345e56724c164e44664d426d608f345493c1..5c5850cafbe5d47083eee7dfcb18a6599b5a967b 100644 (file)
--- 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 737b18082994df73a0a33322b512d2173f31cb61..4b516d4e297a7bdd39666e2ef762993f18f4aeff 100644 (file)
--- 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