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

diff --git a/PizzaService-ejb/lib/jcontacts-core.jar b/PizzaService-ejb/lib/jcontacts-core.jar
new file mode 100644 (file)
index 0000000..59559ef
Binary files /dev/null and b/PizzaService-ejb/lib/jcontacts-core.jar differ

diff --git a/PizzaService-ejb/lib/jphone-core.jar b/PizzaService-ejb/lib/jphone-core.jar
new file mode 100644 (file)
index 0000000..be67aae
Binary files /dev/null and b/PizzaService-ejb/lib/jphone-core.jar differ

diff --git a/PizzaService-ejb/nbproject/build-impl.xml b/PizzaService-ejb/nbproject/build-impl.xml
index b6fa76c658744aca56ec0fe2d9ac0bf7536af062..e675881324a32c3330668f52b9a360d9856b0b54 100644 (file)
--- a/PizzaService-ejb/nbproject/build-impl.xml
+++ b/PizzaService-ejb/nbproject/build-impl.xml
@@ -831,6 +831,8 @@ 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="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -841,19 +843,23 @@ 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="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-lib.jar"/>
+        <basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/>
+        <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.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 "/>
+            <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 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -862,6 +868,8 @@ 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="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/PizzaService-ejb/nbproject/genfiles.properties b/PizzaService-ejb/nbproject/genfiles.properties
index b0a3d1af6fe5a04a010d21e729e3b958a4fbe96a..60ce26923c6b29b8f9343137d8e7b9fbbb95310b 100644 (file)
--- a/PizzaService-ejb/nbproject/genfiles.properties
+++ b/PizzaService-ejb/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=cabe2e92
 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=3f3880db
-nbproject/build-impl.xml.script.CRC32=53812a0a
+nbproject/build-impl.xml.data.CRC32=5de26d8a
+nbproject/build-impl.xml.script.CRC32=4fc94a79
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/PizzaService-ejb/nbproject/project.properties b/PizzaService-ejb/nbproject/project.properties
index 97c442bed6683c342f05502b618e66f85ed4327f..ad9fa13b37934f4062444ff3cbc82ea630836d8b 100644 (file)
--- a/PizzaService-ejb/nbproject/project.properties
+++ b/PizzaService-ejb/nbproject/project.properties
@@ -22,10 +22,12 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.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.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
 includes=**
@@ -48,6 +50,8 @@ javac.classpath=\
     ${file.reference.jcoreee.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
     ${reference.PizzaService-lib.jar}:\
+    ${file.reference.jcontacts-core.jar}:\
+    ${file.reference.jphone-core.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
     ${file.reference.cdi-api.jar}
@@ -88,10 +92,12 @@ run.test.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.encoding=UTF-8
+source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/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.jshop-core.jar=../../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../../jshop-ee-lib/src/
 source.root=src

diff --git a/PizzaService-ejb/nbproject/project.xml b/PizzaService-ejb/nbproject/project.xml
index ea2fe4ec3abf4b17b6bcb9dcd0d3d63db5227a32..fca16a27ded6a74e8140133dd77d82d7c46d91d6 100644 (file)
--- a/PizzaService-ejb/nbproject/project.xml
+++ b/PizzaService-ejb/nbproject/project.xml
@@ -10,6 +10,8 @@
             <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">reference.PizzaService-lib.jar</included-library>
+            <included-library dirs="200">file.reference.jcontacts-core.jar</included-library>
+            <included-library dirs="200">file.reference.jphone-core.jar</included-library>
             <included-library dirs="200">file.reference.jshop-core.jar</included-library>
             <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>

diff --git a/PizzaService-ejb/src/conf/persistence.xml b/PizzaService-ejb/src/conf/persistence.xml
index fe0161d2fd83a9279e63616ac0e659619364dce5..ad81acb9ed69776b5319eeabbf9dc5471e53ee2d 100644 (file)
--- a/PizzaService-ejb/src/conf/persistence.xml
+++ b/PizzaService-ejb/src/conf/persistence.xml
@@ -2,7 +2,12 @@
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
   <persistence-unit name="PizzaService-ejbPU" transaction-type="JTA">
     <jta-data-source>jdbc/shop</jta-data-source>
+    <class>org.mxchange.jcontacts.contact.UserContact</class>
     <class>org.mxchange.jcountry.data.CountryData</class>
+    <class>org.mxchange.jphone.phonenumbers.cellphone.CellphoneNumber</class>
+    <class>org.mxchange.jphone.phonenumbers.fax.FaxNumber</class>
+    <class>org.mxchange.jphone.phonenumbers.landline.LandLineNumber</class>
+    <class>org.mxchange.jphone.phonenumbers.smsprovider.CellphoneProvider</class>
     <class>org.mxchange.jshopcore.model.basket.items.BasketItem</class>
     <class>org.mxchange.jshopcore.model.category.ProductCategory</class>
     <class>org.mxchange.jshopcore.model.customer.ShopCustomer</class>