From: Roland Haeder <roland@mxchange.org>
Date: Thu, 13 Apr 2017 19:22:28 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=32b9c06a723cc29beb45dad11d679c5593c62c51;p=jfinancials-war.git

Continued:
- added jcontacts-business-core.jar (seller)
- added jshop-core.jar (products, etc.)
- updated jfinancials-core.jar

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

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
new file mode 100644
index 00000000..eeb76bd1
Binary files /dev/null and b/lib/jcontacts-business-core.jar differ
diff --git a/lib/jfinancials-core.jar b/lib/jfinancials-core.jar
index d7c326d7..48c5de28 100644
Binary files a/lib/jfinancials-core.jar and b/lib/jfinancials-core.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
new file mode 100644
index 00000000..b158fae1
Binary files /dev/null and b/lib/jshop-core.jar differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index ca5ec870..73017b37 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1036,10 +1036,13 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+        <copyfiles files="${file.reference.jshop-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
-    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
+    <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+        <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+    </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
     </target>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index e4469323..8d4f9a70 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7
 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=6787cdaf
-nbproject/build-impl.xml.script.CRC32=d806451a
+nbproject/build-impl.xml.data.CRC32=ccaf6ba0
+nbproject/build-impl.xml.script.CRC32=c0991b8d
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 00f9b60d..4fb1c883 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -35,6 +35,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
 endorsed.classpath=
 excludes=
+file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar
 file.reference.jfinancials-core.jar=lib/jfinancials-core.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
@@ -46,6 +47,7 @@ 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.jphone-lib.jar=lib/jphone-lib.jar
+file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.juser-core.jar=lib/juser-core.jar
 file.reference.juser-lib.jar=lib/juser-lib.jar
 file.reference.poi-3.14-20160307.jar=lib/poi/poi-3.14-20160307.jar
@@ -69,7 +71,9 @@ javac.classpath=\
     ${file.reference.jcountry-core.jar}:\
     ${file.reference.jcountry-lib.jar}:\
     ${file.reference.jcontacts-core.jar}:\
+    ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.jcontacts-lib.jar}:\
+    ${file.reference.jshop-core.jar}:\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jphone-lib.jar}:\
     ${file.reference.juser-core.jar}:\
@@ -125,6 +129,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-business-core.jar=../jcontacts-business-core/src/
 source.reference.jfinancials-core.jar=../jfinancials-core/src
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
@@ -134,6 +139,7 @@ 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.jphone-lib.jar=../jphone-lib/src/
+source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.juser-core.jar=../juser-core/src/
 source.reference.juser-lib.jar=../juser-lib/src/
 source.root=src
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 1fa48f3b..696876c7 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -7,10 +7,10 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">
-                    <file>${file.reference.jcore-logger-lib.jar}</file>
+                    <file>${file.reference.jcoreee.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcoreee.jar}</file>
+                    <file>${file.reference.jcore-logger-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jcountry-core.jar}</file>
@@ -18,35 +18,30 @@
                 <library dirs="200">
                     <file>${file.reference.jcountry-lib.jar}</file>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.jphone-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jphone-lib.jar}</file>
-                </library>
                 <library dirs="200">
                     <file>${file.reference.jcontacts-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts-lib.jar}</file>
+                    <file>${file.reference.jcontacts-business-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.juser-core.jar}</file>
+                    <file>${file.reference.jcontacts-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.juser-lib.jar}</file>
+                    <file>${file.reference.jshop-core.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcustomer-core.jar}</file>
+                    <file>${file.reference.jphone-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcustomer-lib.jar}</file>
+                    <file>${file.reference.jphone-lib.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jshop-core.jar}</file>
+                    <file>${file.reference.juser-core.jar}</file>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jshop-ee-lib.jar}</file>
+                    <file>${file.reference.juser-lib.jar}</file>
                 </library>
                 <library dirs="200">
                     <file>${file.reference.jfinancials-core.jar}</file>