Refacture:

- moved model (entities) files to jaddressbook-care
- jaddressbook-core.jar is not needed here as no addressbooks are maintained

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 1a5c5a47202642fb8b9ff83408c38e3bacb08d51..b6a2fcd176dd0b0a48127b24479085299b47b2ce 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -831,7 +831,6 @@ exists or setup the property manually. For example like this:
         <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.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.jcontacts-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
@@ -840,6 +839,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jphone-lib.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="${reference.PizzaService-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
@@ -848,7 +848,6 @@ exists or setup the property manually. For example like this:
         <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.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.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
@@ -857,6 +856,7 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.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="${reference.PizzaService-lib.jar}" property="manifest.reference.PizzaService-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 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 "/>
@@ -865,15 +865,15 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.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-lib.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.jphone-core.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.reference.PizzaService-lib.jar}"/>
             <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
@@ -883,7 +883,6 @@ exists or setup the property manually. For example like this:
         <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.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.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
@@ -892,6 +891,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jphone-lib.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="${reference.PizzaService-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 4d5d680c8c98c9e3aa5673f4b4222ea260b68efc..4d1fc4a5ac8e2749044e0beb5faa1ecadfc3cd69 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=0427eba4
-build.xml.script.CRC32=cabe2e92
-build.xml.stylesheet.CRC32=5910fda3@1.51.1
+build.xml.data.CRC32=ed8a7fc7
+build.xml.script.CRC32=9c0f08a9
+build.xml.stylesheet.CRC32=5910fda3@1.55.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=01d50d77
-nbproject/build-impl.xml.script.CRC32=eac55053
+nbproject/build-impl.xml.data.CRC32=dfb4c16e
+nbproject/build-impl.xml.script.CRC32=c1ee3e42
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 2510ad76412a779e6a35a06a31f01436fcdf2930..8dee70c3a7fbc846451b75d01a752ba7b32ca1da 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -55,7 +55,6 @@ javac.classpath=\
     ${file.reference.jcountry-core.jar}:\
     ${file.reference.jcountry-lib.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
-    ${reference.PizzaService-lib.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-lib.jar}:\
     ${file.reference.juser-core.jar}:\
@@ -64,6 +63,7 @@ javac.classpath=\
     ${file.reference.jphone-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
+    ${reference.PizzaService-lib.jar}:\
     ${file.reference.cdi-api.jar}
 javac.debug=true
 javac.deprecation=true

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 4d43a5be05c47a1ca0bd0bb27ef485a99cf1c0c9..bec4a824ca2de0ee73341418c0fcacba432e3f0a 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -10,7 +10,6 @@
             <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.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.jcontacts-lib.jar</included-library>
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
@@ -19,6 +18,7 @@
             <included-library dirs="200">file.reference.jphone-lib.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">reference.PizzaService-lib.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <source-roots>
                 <root id="src.dir"/>