Continued:

- 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/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/project.properties b/nbproject/project.properties
index 50576ac9b29a241bfe5419c787433f329434cddf..513120875f951c3a39a81dd2e64e56766f40f84a 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -37,7 +37,7 @@ file.reference.jcoreee.jar=lib/jcoreee.jar
 file.reference.jcountry-core.jar=lib/jcountry-core.jar
 file.reference.jmailer-ee.jar=lib/jmailer-ee.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
 file.reference.juser-core.jar=lib/juser-core.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
@@ -51,8 +51,8 @@ javac.classpath=\
     ${file.reference.juser-core.jar}:\
     ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jcontacts-business-core.jar}:\
+    ${file.reference.jproduct-core.jar}:\
     ${file.reference.jmailer-ee.jar}:\
-    ${file.reference.jshop-core.jar}:\
     ${libs.jpa20-persistence.classpath}:\
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
@@ -118,7 +118,7 @@ source.reference.jcoreee.jar=../jcoreee/src/
 source.reference.jcountry-core.jar=../jcountry-core/src/
 source.reference.jmailer-ee.jar=../jmailer-ee/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/
 source.reference.juser-core.jar=../juser-core/src/
 src.dir=src
 test.src.dir=test

diff --git a/src/org/mxchange/jfinancials/model/receipt/Billable.java b/src/org/mxchange/jfinancials/model/receipt/Billable.java
index 0e35e18bfba0447655cff1ac9a9c650f701b0fd2..329ac68ce5e830d1ff67ad182bb1b26352d9240b 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/Billable.java
+++ b/src/org/mxchange/jfinancials/model/receipt/Billable.java
@@ -19,7 +19,7 @@ package org.mxchange.jfinancials.model.receipt;
 import java.io.Serializable;
 import java.util.Calendar;
 import org.mxchange.jcontactsbusiness.BusinessContact;
-import org.mxchange.jshopcore.model.payment.PaymentType;
+import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.jusercore.model.user.User;
 
 /**

diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipt.java b/src/org/mxchange/jfinancials/model/receipt/Receipt.java
index 1d334a8a2dbda1fe006388d27b077f301fb5b98e..3edcd31858205c2b2f2e6cb14c054263d1c93ed9 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/Receipt.java
+++ b/src/org/mxchange/jfinancials/model/receipt/Receipt.java
@@ -34,7 +34,7 @@ import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import org.mxchange.jcontactsbusiness.BusinessContact;
 import org.mxchange.jcontactsbusiness.CompanyContact;
-import org.mxchange.jshopcore.model.payment.PaymentType;
+import org.mxchange.jproduct.model.payment.PaymentType;
 import org.mxchange.jusercore.model.user.LoginUser;
 import org.mxchange.jusercore.model.user.User;
 

diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
index 3d6dc5ab1d9b1674a80563da13e9c9b075e34400..4701c75c138c25e8178a0cf63d1e1cf0eb65eb66 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
+++ b/src/org/mxchange/jfinancials/model/receipt/entry/BillableReceiptEntry.java
@@ -19,7 +19,7 @@ package org.mxchange.jfinancials.model.receipt.entry;
 import java.io.Serializable;
 import java.util.Calendar;
 import org.mxchange.jfinancials.model.receipt.Billable;
-import org.mxchange.jshopcore.model.product.Product;
+import org.mxchange.jproduct.model.product.Product;
 
 /**
  * An interface for receipt entries

diff --git a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
index c744b1e2e2c2d8de3c69b968776bd45cc63136d8..44beaf6f91050fd1aa30988bdf691fa89b51a92b 100644 (file)
--- a/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
+++ b/src/org/mxchange/jfinancials/model/receipt/entry/ReceiptEntry.java
@@ -33,8 +33,8 @@ import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import org.mxchange.jfinancials.model.receipt.Billable;
 import org.mxchange.jfinancials.model.receipt.Receipt;
-import org.mxchange.jshopcore.model.product.GenericProduct;
-import org.mxchange.jshopcore.model.product.Product;
+import org.mxchange.jproduct.model.product.GenericProduct;
+import org.mxchange.jproduct.model.product.Product;
 
 /**
  * A class for entryReceipt entries