Continued rewriting:

- added jcontacts-lib
- updated jars
- fixed imports
Signed-off-by:Roland Häder <roland@mxchange.org>

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

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 848bebf4503c8caeeb9557874ffa4a124337d3fb..197b9734f769ec7838a7632dec07f052ddc5990f 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
index 85cbf70f05a29c29ad0c75978a48c2fb4bd5cb21..a82aaf80da08c7c4ccc2abf971a83238974e7019 100644 (file)
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index db3227338b67b878c0705f5630c128c78819fe2d..39dfa930fd3f5c748dc5353591b76b7722692834 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1033,6 +1033,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.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.jcoreee.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.jshop-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1048,6 +1049,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.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.jcoreee.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.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index a1054df4b293b023a5aba58f024ef930bfee1939..e66827a687c78a20460e3d753eb02bb97608ea98 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=82213886
 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=e3c82207
-nbproject/build-impl.xml.script.CRC32=90c15c7c
+nbproject/build-impl.xml.data.CRC32=c43d6e6b
+nbproject/build-impl.xml.script.CRC32=8bd8b36f
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 0dc6d2ea8f6c3cfb8f0f4ea284b12f8a28600352..3dbba6c065bb0bee75c40287b71cef821cf71fc8 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -38,6 +38,7 @@ endorsed.classpath=\
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
+file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
 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
@@ -63,6 +64,7 @@ javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jcoreee.jar}:\
+    ${file.reference.jcontacts-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
     ${reference.PizzaService-lib.jar}:\
@@ -110,6 +112,7 @@ 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-lib.jar=../jcontacts-lib/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 183d8993042c740a76c87084ffd2499e148a697c..f2c64593ebd86e09d07a92bb911570edf07add3c 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,76 +1,80 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-       <type>org.netbeans.modules.web.project</type>
-       <configuration>
-               <data xmlns="http://www.netbeans.org/ns/web-project/3">
-                       <name>PizzaService-war</name>
-                       <minimum-ant-version>1.6.5</minimum-ant-version>
-                       <web-module-libraries>
-                               <library dirs="200">
-                                       <file>${file.reference.jcore.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jcore-logger-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jcoreee.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jshop-core.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.jshop-ee-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${reference.PizzaService-lib.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.cdi-api.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.gf-client.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.log4j-api-2.3.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.log4j-core-2.3.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                               <library dirs="200">
-                                       <file>${file.reference.log4j-web-2.3.jar}</file>
-                                       <path-in-war>WEB-INF/lib</path-in-war>
-                               </library>
-                       </web-module-libraries>
-                       <web-module-additional-libraries/>
-                       <source-roots>
-                               <root id="src.dir"/>
-                       </source-roots>
-                       <test-roots>
-                               <root id="test.src.dir"/>
-                       </test-roots>
-               </data>
-               <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-                       <definitions>.\lib\nblibraries.properties</definitions>
-               </libraries>
-               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-                       <reference>
-                               <foreign-project>PizzaService-lib</foreign-project>
-                               <artifact-type>jar</artifact-type>
-                               <script>build.xml</script>
-                               <target>jar</target>
-                               <clean-target>clean</clean-target>
-                               <id>jar</id>
-                       </reference>
-               </references>
-       </configuration>
+    <type>org.netbeans.modules.web.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/web-project/3">
+            <name>PizzaService-war</name>
+            <minimum-ant-version>1.6.5</minimum-ant-version>
+            <web-module-libraries>
+                <library dirs="200">
+                    <file>${file.reference.jcore.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcore-logger-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcoreee.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jcontacts-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.jshop-ee-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${reference.PizzaService-lib.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.cdi-api.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.gf-client.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.log4j-api-2.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.log4j-core-2.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+                <library dirs="200">
+                    <file>${file.reference.log4j-web-2.3.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
+            </web-module-libraries>
+            <web-module-additional-libraries/>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>.\lib\nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>PizzaService-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
 </project>

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
index ff541c69ef40c21102d6cf928e667a8d21867505..445ab65c0a3063d049e67a45ce23597001d8d43c 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java
@@ -22,9 +22,9 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.UserContact;
-import org.mxchange.jcore.model.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.UserContact;
+import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jshopcore.model.customer.Customer;
 import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote;
 import org.mxchange.jshopcore.model.customer.ShopCustomer;

diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
index 8db9fd76d88f6468d5c2e9df96ab7e6f83377496..c9ef58b385b45f3e960c5bcee22e39b647164e2a 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java
@@ -17,7 +17,7 @@
 package org.mxchange.pizzaapplication.beans.customer;
 
 import java.io.Serializable;
-import org.mxchange.jcore.model.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.gender.Gender;
 import org.mxchange.jshopcore.model.customer.Customer;
 
 /**

diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java
index 8203582c69c718946fc67b197d374bd104d9d156..66d22c8066c1a59c30d7c892b1806f80e17d71e0 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java
@@ -19,8 +19,8 @@ package org.mxchange.pizzaapplication.beans.gender;
 import java.util.List;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Named;
-import org.mxchange.jcore.model.contact.gender.Gender;
-import org.mxchange.jcore.model.contact.gender.GenderUtils;
+import org.mxchange.jcontacts.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.gender.GenderUtils;
 
 /**
  * A customer bean which hides the customer instance

diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java
index e75f2330e25b7c8f63a361070b186d49e3d445d4..722033d1035374978d9e4af4a809ff03b11796a0 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java
@@ -18,7 +18,7 @@ package org.mxchange.pizzaapplication.beans.gender;
 
 import java.io.Serializable;
 import java.util.List;
-import org.mxchange.jcore.model.contact.gender.Gender;
+import org.mxchange.jcontacts.contact.gender.Gender;
 
 /**
  * An interface for data beans