From: Roland Häder <roland@mxchange.org>
Date: Sat, 15 Apr 2017 19:04:41 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4968589611783be00381b0d6ccf655dc7ad8c3e0;p=jfinancials-war.git
Continued:
- jfinancials-core/mailer are now referenced as projects as they are
application-specific projects and not libraries (like e.g. juser-core is)
- replaced jshop-core with jproduct-core as this is what is only needed
Signed-off-by: Roland Häder <roland@mxchange.org>
---
diff --git a/lib/jfinancials-core.jar b/lib/jfinancials-core.jar
deleted file mode 100644
index 48c5de28..00000000
Binary files a/lib/jfinancials-core.jar and /dev/null differ
diff --git a/lib/jfinancials-lib.jar b/lib/jfinancials-lib.jar
deleted file mode 100644
index 67fdd689..00000000
Binary files a/lib/jfinancials-lib.jar and /dev/null differ
diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar
new file mode 100644
index 00000000..3c8ae076
Binary files /dev/null and b/lib/jproduct-core.jar differ
diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar
deleted file mode 100644
index b158fae1..00000000
Binary files a/lib/jshop-core.jar and /dev/null differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 73017b37..8e7c5a9b 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -878,6 +878,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.jfinancials-core}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
<ant antfile="${project.jfinancials-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -886,6 +889,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.jfinancials-core}/build.xml" inheritall="false" target="jar">
+ <property name="deploy.on.save" value="false"/>
+ </ant>
<ant antfile="${project.jfinancials-lib}/build.xml" inheritall="false" target="jar">
<property name="deploy.on.save" value="false"/>
</ant>
@@ -1036,13 +1042,10 @@ 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">
- <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
- </target>
+ <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
<delete dir="${build.web.dir}/WEB-INF/lib"/>
</target>
@@ -1455,6 +1458,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.jfinancials-core}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.jfinancials-lib}/build.xml" inheritall="false" target="clean"/>
<ant antfile="${project.jfinancials-mailer}/build.xml" inheritall="false" target="clean"/>
</target>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 8d4f9a70..826e4635 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=ccaf6ba0
-nbproject/build-impl.xml.script.CRC32=c0991b8d
+nbproject/build-impl.xml.data.CRC32=a0b4dc9a
+nbproject/build-impl.xml.script.CRC32=dc4b8e34
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 4fb1c883..f0c55d02 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -36,7 +36,6 @@ 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
file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
@@ -47,7 +46,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.jproduct-core.jar=lib/jproduct-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
@@ -72,13 +71,13 @@ javac.classpath=\
${file.reference.jcountry-lib.jar}:\
${file.reference.jcontacts-core.jar}:\
${file.reference.jcontacts-business-core.jar}:\
+ ${file.reference.jproduct-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}:\
${file.reference.juser-lib.jar}:\
- ${file.reference.jfinancials-core.jar}:\
+ ${reference.jfinancials-core.jar}:\
${reference.jfinancials-lib.jar}:\
${reference.jfinancials-mailer.jar}:\
${file.reference.cdi-api.jar}:\
@@ -116,9 +115,11 @@ javadoc.windowtitle=JFinancials Web Application
lib.dir=${web.docbase.dir}/WEB-INF/lib
persistence.xml.dir=${conf.dir}
platform.active=default_platform
+project.jfinancials-core=../../NetBeansProjects/jfinancials-core
project.jfinancials-lib=../jfinancials-lib
project.jfinancials-mailer=../../NetBeansProjects/jfinancials-mailer
project.license=agpl30
+reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar
reference.jfinancials-lib.jar=${project.jfinancials-lib}/dist/jfinancials-lib.jar
reference.jfinancials-mailer.jar=${project.jfinancials-mailer}/dist/jfinancials-mailer.jar
resource.dir=setup
@@ -130,7 +131,6 @@ run.test.classpath=\
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/
source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
@@ -139,7 +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.jproduct-core.jar=../jproduct-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 696876c7..3e06816b 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -25,11 +25,10 @@
<file>${file.reference.jcontacts-business-core.jar}</file>
</library>
<library dirs="200">
- <file>${file.reference.jcontacts-lib.jar}</file>
+ <file>${file.reference.jproduct-core.jar}</file>
</library>
<library dirs="200">
- <file>${file.reference.jshop-core.jar}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
+ <file>${file.reference.jcontacts-lib.jar}</file>
</library>
<library dirs="200">
<file>${file.reference.jphone-core.jar}</file>
@@ -44,7 +43,7 @@
<file>${file.reference.juser-lib.jar}</file>
</library>
<library dirs="200">
- <file>${file.reference.jfinancials-core.jar}</file>
+ <file>${reference.jfinancials-core.jar}</file>
</library>
<library dirs="200">
<file>${reference.jfinancials-lib.jar}</file>
@@ -80,6 +79,14 @@
<definitions>./lib/nblibraries.properties</definitions>
</libraries>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+ <reference>
+ <foreign-project>jfinancials-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>jfinancials-lib</foreign-project>
<artifact-type>jar</artifact-type>