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/jfinancials-mailer.jar b/lib/jfinancials-mailer.jar
deleted file mode 100644 (file)
index 18325fd..0000000
Binary files a/lib/jfinancials-mailer.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 d2e0e1fe7806960db7b846745267fbfd8b8a936a..37a00b486790dc52ec4d78b54c763e3a4cc3aaab 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.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>
@@ -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.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>
@@ -847,11 +853,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jproduct-core.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.jmailer-ee.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jfinancials-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.jfinancials-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.jfinancials-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.jfinancials-mailer.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
@@ -866,11 +872,11 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/>
         <basename file="${file.reference.jcontacts-business-core.jar}" property="manifest.file.reference.jcontacts-business-core.jar"/>
         <basename file="${file.reference.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
-        <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
+        <basename file="${file.reference.jproduct-core.jar}" property="manifest.file.reference.jproduct-core.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.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
-        <basename file="${file.reference.jfinancials-core.jar}" property="manifest.file.reference.jfinancials-core.jar"/>
+        <basename file="${reference.jfinancials-core.jar}" property="manifest.reference.jfinancials-core.jar"/>
         <basename file="${reference.jfinancials-lib.jar}" property="manifest.reference.jfinancials-lib.jar"/>
         <basename file="${reference.jfinancials-mailer.jar}" property="manifest.reference.jfinancials-mailer.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
@@ -885,11 +891,11 @@ exists or setup the property manually. For example like this:
             <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
             <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
             <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jproduct-core.jar}"/>
             <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
             <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-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.jfinancials-core.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.reference.jfinancials-core.jar}"/>
             <attribute name="jar-15-Extension-Name" value="${manifest.reference.jfinancials-lib.jar}"/>
             <attribute name="jar-16-Extension-Name" value="${manifest.reference.jfinancials-mailer.jar}"/>
             <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
@@ -905,11 +911,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-business-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jproduct-core.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.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jfinancials-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.jfinancials-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.jfinancials-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.jfinancials-mailer.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
@@ -1296,6 +1302,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"/>
         <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 57024c687924484eb61ab29fbcc096ccb9281bbc..e4bf0328433eb9b43304a9813013e48ffbd3784d 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=7d41e0fd
 build.xml.stylesheet.CRC32=5910fda3@1.51.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=a60a5985
-nbproject/build-impl.xml.script.CRC32=3262b095
+nbproject/build-impl.xml.data.CRC32=db40af14
+nbproject/build-impl.xml.script.CRC32=546bd9bd
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 85a60b29f7366ef9fcd88b0e19952c6d05c31ad9..b206ddc9e97cb757801d2c5a74ac84fa027fc395 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,7 +22,6 @@ 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.jfinancials-mailer.jar=lib/jfinancials-mailer.jar
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
@@ -34,7 +33,7 @@ file.reference.jcountry-lib.jar=lib/jcountry-lib.jar
 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.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
 includes=**
@@ -61,11 +60,11 @@ javac.classpath=\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
     ${file.reference.jcontacts-lib.jar}:\
-    ${file.reference.jshop-core.jar}:\
+    ${file.reference.jproduct-core.jar}:\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
-    ${file.reference.jfinancials-core.jar}:\
+    ${reference.jfinancials-core.jar}:\
     ${reference.jfinancials-lib.jar}:\
     ${reference.jfinancials-mailer.jar}:\
     ${file.reference.cdi-api.jar}
@@ -95,11 +94,13 @@ javadoc.windowtitle=JFinancials EJBs
 meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
+project.jfinancials-core=../../NetBeansProjects/jfinancials-core
 project.juser-core=../juser-core
 project.license=agpl30
 project.jfinancials-lib=../jfinancials-lib
 project.jfinancials-mailer=../../NetBeansProjects/jfinancials-mailer
 project.serviceLocator.class=org.mxchange.jfinancials.mailer.model.delivery.FinancialsMailer
+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
@@ -111,7 +112,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.jfinancials-mailer.jar=../jfinancials-mailer/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
@@ -122,7 +122,7 @@ source.reference.jcountry-lib.jar=../jcountry-lib/src/
 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.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 d03f0d07582561635a41dc4ccdf9be583d343661..d268a832eb5e96ddf0a5c6a87dbbc7ee2b5e7b73 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,11 +14,11 @@
             <included-library dirs="200">file.reference.jcontacts-core.jar</included-library>
             <included-library dirs="200">file.reference.jcontacts-business-core.jar</included-library>
             <included-library dirs="200">file.reference.jcontacts-lib.jar</included-library>
-            <included-library dirs="200">file.reference.jshop-core.jar</included-library>
+            <included-library dirs="200">file.reference.jproduct-core.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.jmailer-ee.jar</included-library>
-            <included-library dirs="200">file.reference.jfinancials-core.jar</included-library>
+            <included-library dirs="200">reference.jfinancials-core.jar</included-library>
             <included-library dirs="200">reference.jfinancials-lib.jar</included-library>
             <included-library dirs="200">reference.jfinancials-mailer.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
@@ -33,6 +33,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>