Continued:

- pizzaservice-core/mailer are now referenced as projects as they are
  application-specific projects and not libraries (like e.g. juser-core is)
- updated jar(s)

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

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

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index 1e83d3ce6bbaae734e674f9e0f12d07c5ed0c341..30f6d13515c63e60f42ad55d79b79b6b0236a349 100644 (file)
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ

diff --git a/lib/pizzaservice-core.jar b/lib/pizzaservice-core.jar
deleted file mode 100644 (file)
index 5fd2b25..0000000
Binary files a/lib/pizzaservice-core.jar and /dev/null differ

diff --git a/lib/pizzaservice-mailer.jar b/lib/pizzaservice-mailer.jar
deleted file mode 100644 (file)
index 48e0bca..0000000
Binary files a/lib/pizzaservice-mailer.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 61ed7c6456c116be755184528cf7eec66dbb4c97..4c1f7558854472df4e8d197f3c9f51964540310d 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -806,6 +806,9 @@ exists or setup the property manually. For example like this:
                 COMPILATION SECTION
             -->
     <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -817,6 +820,9 @@ exists or setup the property manually. For example like this:
         </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
@@ -842,16 +848,20 @@ exists or setup the property manually. For example like this:
         <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-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcustomer-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.jshop-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -861,38 +871,46 @@ exists or setup the property manually. For example like this:
         <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-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
         <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
         <basename file="${file.reference.juser-activity-core.jar}" property="manifest.file.reference.juser-activity-core.jar"/>
         <basename file="${file.reference.juser-activity-lib.jar}" property="manifest.file.reference.juser-activity-lib.jar"/>
+        <basename file="${file.reference.jcustomer-core.jar}" property="manifest.file.reference.jcustomer-core.jar"/>
+        <basename file="${file.reference.jcustomer-lib.jar}" property="manifest.file.reference.jcustomer-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.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.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
-        <basename file="${file.reference.pizzaservice-core.jar}" property="manifest.file.reference.pizzaservice-core.jar"/>
+        <basename file="${reference.pizzaservice-core.jar}" property="manifest.reference.pizzaservice-core.jar"/>
         <basename file="${reference.pizzaservice-lib.jar}" property="manifest.reference.pizzaservice-lib.jar"/>
         <basename file="${reference.pizzaservice-mailer.jar}" property="manifest.reference.pizzaservice-mailer.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 jar-16 jar-17 "/>
+            <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 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <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.jphone-core.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jphone-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.juser-activity-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
+            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jcustomer-core.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jcustomer-lib.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.reference.pizzaservice-core.jar}"/>
+            <attribute name="jar-19-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
+            <attribute name="jar-20-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/>
+            <attribute name="jar-21-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -900,16 +918,20 @@ exists or setup the property manually. For example like this:
         <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-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcustomer-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.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.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
@@ -1296,6 +1318,7 @@ exists or setup the property manually. For example like this:
                 CLEANUP SECTION
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 769ed07d18744b2f4d1db2c875cc778ca00cb158..9cdbf0b476cca8123cf588fec685f9d9eff9c57c 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,7 +39,6 @@ file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
 file.reference.juser-activity-core.jar=lib/juser-activity-core.jar
 file.reference.juser-activity-lib.jar=lib/juser-activity-lib.jar
-file.reference.pizzaservice-core.jar=lib/pizzaservice-core.jar
 file.reference.pizzaservice-mailer.jar=lib/pizzaservice-mailer.jar
 includes=**
 j2ee.compile.on.save=true
@@ -73,7 +72,7 @@ javac.classpath=\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
-    ${file.reference.pizzaservice-core.jar}:\
+    ${reference.pizzaservice-core.jar}:\
     ${reference.pizzaservice-lib.jar}:\
     ${reference.pizzaservice-mailer.jar}:\
     ${file.reference.cdi-api.jar}
@@ -105,10 +104,12 @@ meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
 project.license=agpl30
+project.pizzaservice-core=../../NetBeansProjects/pizzaservice-core
 project.pizzaservice-lib=../pizzaservice-lib
 project.pizzaservice-mailer=../../NetBeansProjects/pizzaservice-mailer
 project.serviceLocator.class=org.mxchange.pizzaapplication.mailer.model.delivery.PizzaMailer
 project.juser-core=../juser-core
+reference.pizzaservice-core.jar=${project.pizzaservice-core}/dist/pizzaservice-core.jar
 reference.pizzaservice-lib.jar=${project.pizzaservice-lib}/dist/pizzaservice-lib.jar
 reference.pizzaservice-mailer.jar=${project.pizzaservice-mailer}/dist/pizzaservice-mailer.jar
 resource.dir=setup
@@ -136,7 +137,6 @@ source.reference.juser-core.jar=../juser-core/src/
 source.reference.juser-lib.jar=../juser-lib/src/
 source.reference.juser-activity-core.jar=../juser-activity-core/src/
 source.reference.juser-activity-lib.jar=../juser-activity-lib/src/
-source.reference.pizzaservice-core.jar=../pizzaservice-core/src/
 source.reference.pizzaservice-mailer.jar=../pizzaservice-mailer/src/
 source.root=src
 src.dir=${source.root}/java

diff --git a/nbproject/project.xml b/nbproject/project.xml
index d451355de3c201fae656eafb1816c770f1026c53..3282b4238c83278b6f637d05b3e15d8ed4e7a704 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -9,16 +9,20 @@
             <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-lib.jar</included-library>
             <included-library dirs="200">file.reference.juser-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-lib.jar</included-library>
             <included-library dirs="200">file.reference.juser-activity-core.jar</included-library>
             <included-library dirs="200">file.reference.juser-activity-lib.jar</included-library>
+            <included-library dirs="200">file.reference.jcustomer-core.jar</included-library>
+            <included-library dirs="200">file.reference.jcustomer-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.jshop-core.jar</included-library>
+            <included-library dirs="200">file.reference.jshop-ee-lib.jar</included-library>
             <included-library dirs="200">file.reference.jmailer-ee.jar</included-library>
-            <included-library dirs="200">file.reference.pizzaservice-core.jar</included-library>
+            <included-library dirs="200">reference.pizzaservice-core.jar</included-library>
             <included-library dirs="200">reference.pizzaservice-lib.jar</included-library>
             <included-library dirs="200">reference.pizzaservice-mailer.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
@@ -33,6 +37,14 @@
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>pizzaservice-core</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
             <reference>
                 <foreign-project>pizzaservice-lib</foreign-project>
                 <artifact-type>jar</artifact-type>