Maybe repeat:

- added new dependency jproduct-lib JAR as receipt items will have a reference
  to GenericProduct entity

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

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index c7ca09da317bf20ee5b96cc089b2b59c0d6d73fb..8a670fe22e11fb6b4be1a06fb5c9a76cd46e2cf4 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -855,6 +855,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-business-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jproduct-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jproduct-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-login-core.jar}" todir="${build.classes.dir}"/>
@@ -878,6 +879,7 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jcontacts-business-lib.jar}" property="manifest.file.reference.jcontacts-business-lib.jar"/>
         <basename file="${file.reference.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
         <basename file="${file.reference.jproduct-core.jar}" property="manifest.file.reference.jproduct-core.jar"/>
+        <basename file="${file.reference.jproduct-lib.jar}" property="manifest.file.reference.jproduct-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-login-core.jar}" property="manifest.file.reference.juser-login-core.jar"/>
@@ -889,7 +891,7 @@ exists or setup the property manually. For example like this:
         <basename file="${reference.jfinancials-mailer-lib.jar}" property="manifest.reference.jfinancials-mailer-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 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 "/>
+            <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 jar-22 "/>
             <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}"/>
@@ -901,16 +903,17 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcontacts-business-lib.jar}"/>
             <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
             <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jproduct-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.juser-login-core.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.juser-login-lib.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-18-Extension-Name" value="${manifest.reference.jfinancials-core.jar}"/>
-            <attribute name="jar-19-Extension-Name" value="${manifest.reference.jfinancials-lib.jar}"/>
-            <attribute name="jar-20-Extension-Name" value="${manifest.reference.jfinancials-mailer-lib.jar}"/>
-            <attribute name="jar-21-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jproduct-lib.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.juser-login-core.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.juser-login-lib.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-19-Extension-Name" value="${manifest.reference.jfinancials-core.jar}"/>
+            <attribute name="jar-20-Extension-Name" value="${manifest.reference.jfinancials-lib.jar}"/>
+            <attribute name="jar-21-Extension-Name" value="${manifest.reference.jfinancials-mailer-lib.jar}"/>
+            <attribute name="jar-22-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -925,6 +928,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-business-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jproduct-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jproduct-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-login-core.jar}" todir="${dist.ear.dir}/lib"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index d625669d5807672dc35553388c6b82bc06f59497..307a88fcfdd70a4367178d931e761a6c86ef7e35 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,6 +35,7 @@ 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.jproduct-core.jar=lib/jproduct-core.jar
+file.reference.jproduct-lib.jar=lib/jproduct-lib.jar
 file.reference.juser-activity-core.jar=lib/juser-activity-core.jar
 file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
@@ -66,6 +67,7 @@ javac.classpath=\
     ${file.reference.jcontacts-business-lib.jar}:\
     ${file.reference.jcontacts-lib.jar}:\
     ${file.reference.jproduct-core.jar}:\
+    ${file.reference.jproduct-lib.jar}:\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.juser-login-core.jar}:\
@@ -132,6 +134,7 @@ 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.jproduct-core.jar=../jproduct-core/src/
+source.reference.jproduct-lib.jar=../jproduct-lib/src/
 source.reference.juser-activity-core.jar=../juser-activity-core/src/
 source.reference.juser-core.jar=../juser-core/src/
 source.reference.juser-lib.jar=../juser-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 0b972406d9695eb831289a7592c9a465393ef895..bc504680abfdbb091c2f7e22ce1be28528df233d 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -16,6 +16,7 @@
             <included-library dirs="200">file.reference.jcontacts-business-lib.jar</included-library>
             <included-library dirs="200">file.reference.jcontacts-lib.jar</included-library>
             <included-library dirs="200">file.reference.jproduct-core.jar</included-library>
+            <included-library dirs="200">file.reference.jproduct-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-login-core.jar</included-library>