From b0b3ed5509bed27708e8467c6f473e8b97fcf15b Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sat, 9 Apr 2016 18:09:35 +0200
Subject: [PATCH] introduced new lib jphone-lib.jar which holds remote
 interfaces for jphone-core + added jcountry-lib (new dependency)

---
 lib/jcountry-lib.jar                          | Bin 0 -> 1293 bytes
 lib/jphone-lib.jar                            | Bin 0 -> 1622 bytes
 nbproject/build-impl.xml                      |  28 +++++++++++-------
 nbproject/genfiles.properties                 |   4 +--
 nbproject/project.properties                  |   6 ++++
 nbproject/project.xml                         |   2 ++
 .../data/AddressbookCountrySingletonBean.java |   2 +-
 .../AddressbookSmsProviderSingletonBean.java  |   2 +-
 8 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 lib/jcountry-lib.jar
 create mode 100644 lib/jphone-lib.jar

diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f8f305c82dcfd1f764421d3083f4e33500f14d91
GIT binary patch
literal 1293
zcmah|%Wl&^6upzA4KcM;p$H^ckYy`~9YCdpAS5?xM3qM)T(LzHcSt9ij-&AeQFfIO
zY+%chRky6zvETzL@eln0#2-}LiG%Z?F;^OUJU-{#J2U5Y8rhr$a0TGg=XcLwDhiN;
z*3Q0H-fh?2i!*>u0{w_k@5|Ts1B9DV#F0Q-UVFE`<L^7IdW%Z_ibcBof~kmy@^R^&
zQ?V^iPOW$Y8XU3`uHnx|&O_U(DMmFrC~qGd{FYOBxp}|LrDjS}QSMeYN^5(H27;Ap
zp&EpWYLs5LE!&z@IKP=3Rv4<DyBJ}Q5l3%=Ln?bL1$uoR+7H5^)ap2eb88{zfNDBN
zy!*{R-y{HLRMUyIIJ3`XPcR+IZARsDb`)yn1cFA<*~RxCsPF*nJXm?SnuiqvD^!S>
z$XP_-+S+=vPhV4asJU>PJknJH1)ujM)kDPyZ2bdx(ln=;oK<oFqs@$Ksy;;-%MXVt
zV0A7~=XOf9rT_vP|ChaFs{~d@^$WZ>cdy%LfhJHKE%DIxnc`INx3nwRG64b^99cXR
zk|XHxCHz{(uMFgIhK+!;LZ?A8#q8q7KorI*{PN5@@qXMU6Y6D+VhAQqPwwC|p-#0;
zT5@CLI85@NIE`&R$vJO*W9&E#<2O!c&NwZZF?t+^dK29^LrrcyO~V*}qS0QcF>Zs|
jeatt)U#ZiR59vZFMjN$7r?F)29IreN=O}f<_yPU^*HkdU

literal 0
HcmV?d00001

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(yFWpg<O_x!h9cUXbB>rBh{Os;cjSHW-f?8U;e7m^1<5JUN
z#ZAZUJ1+H+dQDYSC7EHY7Ayt8aXb2SggQjnM`o9b4x0g$<w~*$+Us{6G0S6Ribvol
z26h|!Gb5mO9(T|7`mS@x512bf_4#A|{RaXd*OQA<wQR3Bq-}B0v6%0O4MxQ-vmKw6
zOpAKn>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$g31<Xwu^s-X^}ntYA{Sp-I=PD2aq?
zB<1PBS4IRuuWC~m5<@yGAt~<AWI}JwLl>X<aq4lgkH}Aszh9L4AA$*_->lBbp~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 42cd133..5d071c6 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -836,7 +836,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
@@ -851,7 +853,9 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
         <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
         <basename file="${file.reference.jcountry-core.jar}" property="manifest.file.reference.jcountry-core.jar"/>
+        <basename file="${file.reference.jcountry-lib.jar}" property="manifest.file.reference.jcountry-lib.jar"/>
         <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/>
+        <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/>
         <basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/>
         <basename file="${file.reference.jcontacts-business-core.jar}" property="manifest.file.reference.jcontacts-business-core.jar"/>
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
@@ -861,20 +865,22 @@ exists or setup the property manually. For example like this:
         <basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
         <basename file="${reference.juser-core.jar}" property="manifest.reference.juser-core.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -882,7 +888,9 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 0438788..af8cce5 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=7d41e0fd
 build.xml.stylesheet.CRC32=5910fda3@1.51.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=bc3e0f41
-nbproject/build-impl.xml.script.CRC32=9c66876e
+nbproject/build-impl.xml.data.CRC32=29facf74
+nbproject/build-impl.xml.script.CRC32=f1d05ee9
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index d1605b4..3a86c3b 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -28,8 +28,10 @@ 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.jmailer-ee.jar=lib/jmailer-ee.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=**
@@ -51,7 +53,9 @@ javac.classpath=\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jcountry-core.jar}:\
+    ${file.reference.jcountry-lib.jar}:\
     ${file.reference.jphone-core.jar}:\
+    ${file.reference.jphone-lib.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.juser-core.jar}:\
@@ -106,8 +110,10 @@ 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.jmailer-ee.jar=../jmailer-ee/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 7290bc7..a850cc5 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -9,7 +9,9 @@
             <included-library dirs="200">file.reference.jcoreee.jar</included-library>
             <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library>
             <included-library dirs="200">file.reference.jcountry-core.jar</included-library>
+            <included-library dirs="200">file.reference.jcountry-lib.jar</included-library>
             <included-library dirs="200">file.reference.jphone-core.jar</included-library>
+            <included-library dirs="200">file.reference.jphone-lib.jar</included-library>
             <included-library dirs="200">file.reference.jcontacts-core.jar</included-library>
             <included-library dirs="200">file.reference.jcontacts-business-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
diff --git a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
index 1fa151c..3646dce 100644
--- a/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
+++ b/src/java/org/mxchange/jcountry/data/AddressbookCountrySingletonBean.java
@@ -29,7 +29,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean;
  */
 @Startup
 @Singleton (name = "country", mappedName = "ejb/addressbook-singleton-country", description = "A singleton session bean for country informations")
-public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements AddressbookCountrySingletonBeanRemote {
+public class AddressbookCountrySingletonBean extends BaseDatabaseBean implements CountrySingletonBeanRemote {
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBean.java
index 25996e1..6394902 100644
--- a/src/java/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBean.java
@@ -29,7 +29,7 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean;
  */
 @Startup
 @Singleton (name = "smsprovider", mappedName = "ejb/addressbook-singleton-smsprovider", description = "A singleton session bean for SMS provider informations")
-public class AddressbookSmsProviderSingletonBean extends BaseDatabaseBean implements AddressbookSmsProviderSingletonBeanRemote {
+public class AddressbookSmsProviderSingletonBean extends BaseDatabaseBean implements SmsProviderSingletonBeanRemote {
 
 	/**
 	 * Serial number
-- 
2.39.5