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 (file)
index 48c5de2..0000000
Binary files a/lib/jfinancials-core.jar and /dev/null differ

diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar
new file mode 100644 (file)
index 0000000..3c8ae07
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 (file)
index b158fae..0000000
Binary files a/lib/jshop-core.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 28d1f03393808c2f5488c2a9a408174465747e0d..6dda968fa1f128ff50b05e63d41e1a40a7cc4c4d 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -927,6 +927,14 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.jfinancials-core}" name="call.subproject"/>
+            <param location="${project.jfinancials-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-jar.properties}"/>
             <param location="${project.jfinancials-lib}" name="call.subproject"/>
@@ -1420,6 +1428,14 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.jfinancials-core}" name="call.subproject"/>
+            <param location="${project.jfinancials-core}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
         <antcall target="-maybe-call-dep">
             <param name="call.built.properties" value="${built-clean.properties}"/>
             <param location="${project.jfinancials-lib}" name="call.subproject"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 68ef8a360acf50cb4ee210bd15715dd0f06202c7..ab7a001ee4111fd161c9b7263e36d4862a1f744f 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=9bef99a6
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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=a2ef3a71
-nbproject/build-impl.xml.script.CRC32=73834a8e
+nbproject/build-impl.xml.data.CRC32=2eee1006
+nbproject/build-impl.xml.script.CRC32=2e8932d1
 nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 9267fd4f64ebb44cc676e06a5c9965a7121d3c98..1e24c4bab8a213fd43b308ec99b90d5b9248b842 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,14 +31,13 @@ dist.javadoc.dir=${dist.dir}/javadoc
 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.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore-swing.jar=lib/jcore-swing.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcountry-core.jar=lib/jcountry-core.jar
 file.reference.jphone-core.jar=lib/jphone-core.jar
-file.reference.jshop-core.jar=lib/jshop-core.jar
+file.reference.jproduct-core.jar=lib/jproduct-core.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
@@ -51,8 +50,8 @@ javac.classpath=\
     ${file.reference.jphone-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
-    ${file.reference.jshop-core.jar}:\
-    ${file.reference.jfinancials-core.jar}:\
+    ${file.reference.jproduct-core.jar}:\
+    ${reference.jfinancials-core.jar}:\
     ${reference.jfinancials-lib.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
@@ -96,8 +95,10 @@ manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
+project.jfinancials-core=../../NetBeansProjects/jfinancials-core
 project.jfinancials-lib=../jfinancials-lib
 project.license=gpl30
+reference.jfinancials-core.jar=${project.jfinancials-core}/dist/jfinancials-core.jar
 reference.jfinancials-lib.jar=${project.jfinancials-lib}/dist/jfinancials-lib.jar
 run.classpath=\
     ${javac.classpath}:\
@@ -111,13 +112,12 @@ run.test.classpath=\
     ${build.test.classes.dir}
 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.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore-swing.jar=../jcore-swing/src
 source.reference.jcore.jar=../jcore/src
 source.reference.jcountry-core.jar=../jcountry-core/src/
 source.reference.jphone-core.jar=../jphone-core/src/
-source.reference.jshop-core.jar=../jshop-core/src/
+source.reference.jproduct-core.jar=../jproduct-core/src/
 src.dir=src
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 2094510219f694b9f0790bb29eb54f635cbda282..9d6ea1c57c5508878829dd72a1972dd60fc6c0b2 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -15,6 +15,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>