From f87ae2683a71f2b676e870f07f3c4d594e9d363f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 15 Apr 2017 20:57:48 +0200 Subject: [PATCH] Continued: - replaced jshop-core with jproduct-core as this is what is only needed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jproduct-core.jar | Bin 0 -> 22741 bytes lib/jshop-core.jar | Bin 47889 -> 0 bytes nbproject/project.properties | 6 +++--- .../jfinancials/model/receipt/Billable.java | 2 +- .../jfinancials/model/receipt/Receipt.java | 2 +- .../receipt/entry/BillableReceiptEntry.java | 2 +- .../model/receipt/entry/ReceiptEntry.java | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 lib/jproduct-core.jar delete mode 100644 lib/jshop-core.jar diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..3c8ae0768c4fa2ec6ccd58b0655001fed291653a GIT binary patch literal 22741 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 diff --git a/nbproject/project.properties b/nbproject/project.properties index 50576ac..5131208 100644 --- 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 0e35e18..329ac68 100644 --- 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 1d334a8..3edcd31 100644 --- 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 3d6dc5a..4701c75 100644 --- 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 c744b1e..44beaf6 100644 --- 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 -- 2.39.5