From bf1e54a2964e53d7454565b3687a78dd41f9cc6c Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 4 Sep 2015 23:38:18 +0200 Subject: [PATCH] =?utf8?q?Moved=20stuff=20around=20+=20added=20dist.sh=20S?= =?utf8?q?igned-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- dist.sh | 10 ++++++++++ .../mxchange/{jshop => jshopcore}/BaseShopCore.java | 4 ++-- .../mxchange/{jshop => jshopcore}/ShopInterface.java | 4 ++-- .../exceptions/CategoryTitleAlreadyUsedException.java | 4 ++-- .../exceptions/ProductTitleAlreadyUsedException.java | 4 ++-- .../{jshop => jshopcore}/model/basket/BaseBasket.java | 6 +++--- .../{jshop => jshopcore}/model/basket/Basket.java | 6 +++--- .../model/basket/item/ItemBasket.java | 8 ++++---- .../model/category/BaseCategory.java | 4 ++-- .../{jshop => jshopcore}/model/category/Category.java | 4 ++-- .../model/category/product/ProductCategory.java | 4 ++-- .../{jshop => jshopcore}/model/customer/Customer.java | 2 +- .../model/customer/ShopCustomer.java | 2 +- .../model/item/AddableBasketItem.java | 4 ++-- .../{jshop => jshopcore}/model/item/BaseItem.java | 4 ++-- .../model/item/basket/BasketItem.java | 8 ++++---- .../model/product/BaseProduct.java | 4 ++-- .../{jshop => jshopcore}/model/product/Product.java | 4 ++-- .../model/product/generic/GenericProduct.java | 6 +++--- 19 files changed, 51 insertions(+), 41 deletions(-) create mode 100755 dist.sh rename src/org/mxchange/{jshop => jshopcore}/BaseShopCore.java (93%) rename src/org/mxchange/{jshop => jshopcore}/ShopInterface.java (92%) rename src/org/mxchange/{jshop => jshopcore}/exceptions/CategoryTitleAlreadyUsedException.java (92%) rename src/org/mxchange/{jshop => jshopcore}/exceptions/ProductTitleAlreadyUsedException.java (92%) rename src/org/mxchange/{jshop => jshopcore}/model/basket/BaseBasket.java (96%) rename src/org/mxchange/{jshop => jshopcore}/model/basket/Basket.java (96%) rename src/org/mxchange/{jshop => jshopcore}/model/basket/item/ItemBasket.java (84%) rename src/org/mxchange/{jshop => jshopcore}/model/category/BaseCategory.java (97%) rename src/org/mxchange/{jshop => jshopcore}/model/category/Category.java (95%) rename src/org/mxchange/{jshop => jshopcore}/model/category/product/ProductCategory.java (91%) rename src/org/mxchange/{jshop => jshopcore}/model/customer/Customer.java (94%) rename src/org/mxchange/{jshop => jshopcore}/model/customer/ShopCustomer.java (94%) rename src/org/mxchange/{jshop => jshopcore}/model/item/AddableBasketItem.java (95%) rename src/org/mxchange/{jshop => jshopcore}/model/item/BaseItem.java (97%) rename src/org/mxchange/{jshop => jshopcore}/model/item/basket/BasketItem.java (87%) rename src/org/mxchange/{jshop => jshopcore}/model/product/BaseProduct.java (96%) rename src/org/mxchange/{jshop => jshopcore}/model/product/Product.java (95%) rename src/org/mxchange/{jshop => jshopcore}/model/product/generic/GenericProduct.java (90%) diff --git a/dist.sh b/dist.sh new file mode 100755 index 0000000..05a4fc4 --- /dev/null +++ b/dist.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +NAME="jshop-core" +LIST=`find ../*/lib/${NAME}.jar` +LIST="${LIST} `find ../*/*-ejb/lib/${NAME}.jar`" + +for entry in ${LIST}; +do + cp -v dist/${NAME}.jar ${entry} +done diff --git a/src/org/mxchange/jshop/BaseShopCore.java b/src/org/mxchange/jshopcore/BaseShopCore.java similarity index 93% rename from src/org/mxchange/jshop/BaseShopCore.java rename to src/org/mxchange/jshopcore/BaseShopCore.java index 4c1acba..fe407a6 100644 --- a/src/org/mxchange/jshop/BaseShopCore.java +++ b/src/org/mxchange/jshopcore/BaseShopCore.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop; +package org.mxchange.jshopcore; import org.mxchange.jcore.BaseFrameworkSystem; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.product.Product; /** * A general shop class diff --git a/src/org/mxchange/jshop/ShopInterface.java b/src/org/mxchange/jshopcore/ShopInterface.java similarity index 92% rename from src/org/mxchange/jshop/ShopInterface.java rename to src/org/mxchange/jshopcore/ShopInterface.java index 9e3091c..d2813e5 100644 --- a/src/org/mxchange/jshop/ShopInterface.java +++ b/src/org/mxchange/jshopcore/ShopInterface.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop; +package org.mxchange.jshopcore; import org.mxchange.jcore.FrameworkInterface; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.product.Product; /** * A general shop interface diff --git a/src/org/mxchange/jshop/exceptions/CategoryTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java similarity index 92% rename from src/org/mxchange/jshop/exceptions/CategoryTitleAlreadyUsedException.java rename to src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java index d7d90dd..ae81b3c 100644 --- a/src/org/mxchange/jshop/exceptions/CategoryTitleAlreadyUsedException.java +++ b/src/org/mxchange/jshopcore/exceptions/CategoryTitleAlreadyUsedException.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.exceptions; +package org.mxchange.jshopcore.exceptions; import java.text.MessageFormat; -import org.mxchange.jshop.model.category.Category; +import org.mxchange.jshopcore.model.category.Category; /** * An exception thrown when the given title is already used diff --git a/src/org/mxchange/jshop/exceptions/ProductTitleAlreadyUsedException.java b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java similarity index 92% rename from src/org/mxchange/jshop/exceptions/ProductTitleAlreadyUsedException.java rename to src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java index 18c3340..1206661 100644 --- a/src/org/mxchange/jshop/exceptions/ProductTitleAlreadyUsedException.java +++ b/src/org/mxchange/jshopcore/exceptions/ProductTitleAlreadyUsedException.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.exceptions; +package org.mxchange.jshopcore.exceptions; import java.text.MessageFormat; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.product.Product; /** * An exception thrown when the given title is already used diff --git a/src/org/mxchange/jshop/model/basket/BaseBasket.java b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java similarity index 96% rename from src/org/mxchange/jshop/model/basket/BaseBasket.java rename to src/org/mxchange/jshopcore/model/basket/BaseBasket.java index 4fec090..9c2b1ae 100644 --- a/src/org/mxchange/jshop/model/basket/BaseBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/BaseBasket.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.basket; +package org.mxchange.jshopcore.model.basket; import java.io.IOException; import java.io.Serializable; @@ -22,8 +22,8 @@ import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.text.MessageFormat; import java.util.Map; -import org.mxchange.jshop.BaseShopCore; -import org.mxchange.jshop.model.item.AddableBasketItem; +import org.mxchange.jshopcore.BaseShopCore; +import org.mxchange.jshopcore.model.item.AddableBasketItem; /** * A general basket class diff --git a/src/org/mxchange/jshop/model/basket/Basket.java b/src/org/mxchange/jshopcore/model/basket/Basket.java similarity index 96% rename from src/org/mxchange/jshop/model/basket/Basket.java rename to src/org/mxchange/jshopcore/model/basket/Basket.java index 97148b6..97423d7 100644 --- a/src/org/mxchange/jshop/model/basket/Basket.java +++ b/src/org/mxchange/jshopcore/model/basket/Basket.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.basket; +package org.mxchange.jshopcore.model.basket; import java.io.IOException; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.sql.SQLException; import java.util.Map; -import org.mxchange.jshop.ShopInterface; -import org.mxchange.jshop.model.item.AddableBasketItem; +import org.mxchange.jshopcore.ShopInterface; +import org.mxchange.jshopcore.model.item.AddableBasketItem; /** * An interface for baskets diff --git a/src/org/mxchange/jshop/model/basket/item/ItemBasket.java b/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java similarity index 84% rename from src/org/mxchange/jshop/model/basket/item/ItemBasket.java rename to src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java index 1e3045f..b7dda1f 100644 --- a/src/org/mxchange/jshop/model/basket/item/ItemBasket.java +++ b/src/org/mxchange/jshopcore/model/basket/item/ItemBasket.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.basket.item; +package org.mxchange.jshopcore.model.basket.item; import java.sql.SQLException; -import org.mxchange.jshop.model.basket.BaseBasket; -import org.mxchange.jshop.model.basket.Basket; -import org.mxchange.jshop.model.item.AddableBasketItem; +import org.mxchange.jshopcore.model.basket.BaseBasket; +import org.mxchange.jshopcore.model.basket.Basket; +import org.mxchange.jshopcore.model.item.AddableBasketItem; /** * A basket for orderable items diff --git a/src/org/mxchange/jshop/model/category/BaseCategory.java b/src/org/mxchange/jshopcore/model/category/BaseCategory.java similarity index 97% rename from src/org/mxchange/jshop/model/category/BaseCategory.java rename to src/org/mxchange/jshopcore/model/category/BaseCategory.java index 2a4264d..493da9b 100644 --- a/src/org/mxchange/jshop/model/category/BaseCategory.java +++ b/src/org/mxchange/jshopcore/model/category/BaseCategory.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.category; +package org.mxchange.jshopcore.model.category; import java.io.UnsupportedEncodingException; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jshop.BaseShopCore; +import org.mxchange.jshopcore.BaseShopCore; /** * A general product category class diff --git a/src/org/mxchange/jshop/model/category/Category.java b/src/org/mxchange/jshopcore/model/category/Category.java similarity index 95% rename from src/org/mxchange/jshop/model/category/Category.java rename to src/org/mxchange/jshopcore/model/category/Category.java index d8ae5b0..a32f8bd 100644 --- a/src/org/mxchange/jshop/model/category/Category.java +++ b/src/org/mxchange/jshopcore/model/category/Category.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.category; +package org.mxchange.jshopcore.model.category; import java.io.UnsupportedEncodingException; -import org.mxchange.jshop.ShopInterface; +import org.mxchange.jshopcore.ShopInterface; /** * An interface for categories diff --git a/src/org/mxchange/jshop/model/category/product/ProductCategory.java b/src/org/mxchange/jshopcore/model/category/product/ProductCategory.java similarity index 91% rename from src/org/mxchange/jshop/model/category/product/ProductCategory.java rename to src/org/mxchange/jshopcore/model/category/product/ProductCategory.java index 7787b1f..86b531f 100644 --- a/src/org/mxchange/jshop/model/category/product/ProductCategory.java +++ b/src/org/mxchange/jshopcore/model/category/product/ProductCategory.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.category.product; +package org.mxchange.jshopcore.model.category.product; -import org.mxchange.jshop.model.category.BaseCategory; +import org.mxchange.jshopcore.model.category.BaseCategory; /** * A product category diff --git a/src/org/mxchange/jshop/model/customer/Customer.java b/src/org/mxchange/jshopcore/model/customer/Customer.java similarity index 94% rename from src/org/mxchange/jshop/model/customer/Customer.java rename to src/org/mxchange/jshopcore/model/customer/Customer.java index 61fb863..4524d65 100644 --- a/src/org/mxchange/jshop/model/customer/Customer.java +++ b/src/org/mxchange/jshopcore/model/customer/Customer.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.customer; +package org.mxchange.jshopcore.model.customer; import org.mxchange.jcore.model.contact.Contact; diff --git a/src/org/mxchange/jshop/model/customer/ShopCustomer.java b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java similarity index 94% rename from src/org/mxchange/jshop/model/customer/ShopCustomer.java rename to src/org/mxchange/jshopcore/model/customer/ShopCustomer.java index 4fd24c0..d0c3e57 100644 --- a/src/org/mxchange/jshop/model/customer/ShopCustomer.java +++ b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.customer; +package org.mxchange.jshopcore.model.customer; import org.mxchange.jcore.model.contact.BaseContact; diff --git a/src/org/mxchange/jshop/model/item/AddableBasketItem.java b/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java similarity index 95% rename from src/org/mxchange/jshop/model/item/AddableBasketItem.java rename to src/org/mxchange/jshopcore/model/item/AddableBasketItem.java index 066a76c..8ca2c40 100644 --- a/src/org/mxchange/jshop/model/item/AddableBasketItem.java +++ b/src/org/mxchange/jshopcore/model/item/AddableBasketItem.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.item; +package org.mxchange.jshopcore.model.item; -import org.mxchange.jshop.ShopInterface; +import org.mxchange.jshopcore.ShopInterface; /** * An interface for addable basket items diff --git a/src/org/mxchange/jshop/model/item/BaseItem.java b/src/org/mxchange/jshopcore/model/item/BaseItem.java similarity index 97% rename from src/org/mxchange/jshop/model/item/BaseItem.java rename to src/org/mxchange/jshopcore/model/item/BaseItem.java index 53c9a53..25c758d 100644 --- a/src/org/mxchange/jshop/model/item/BaseItem.java +++ b/src/org/mxchange/jshopcore/model/item/BaseItem.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.item; +package org.mxchange.jshopcore.model.item; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jshop.BaseShopCore; +import org.mxchange.jshopcore.BaseShopCore; /** * An item (addedable to a basket) could respresent a product or a discount diff --git a/src/org/mxchange/jshop/model/item/basket/BasketItem.java b/src/org/mxchange/jshopcore/model/item/basket/BasketItem.java similarity index 87% rename from src/org/mxchange/jshop/model/item/basket/BasketItem.java rename to src/org/mxchange/jshopcore/model/item/basket/BasketItem.java index 633a3ef..2807023 100644 --- a/src/org/mxchange/jshop/model/item/basket/BasketItem.java +++ b/src/org/mxchange/jshopcore/model/item/basket/BasketItem.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.item.basket; +package org.mxchange.jshopcore.model.item.basket; import java.text.MessageFormat; -import org.mxchange.jshop.model.item.AddableBasketItem; -import org.mxchange.jshop.model.item.BaseItem; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.item.AddableBasketItem; +import org.mxchange.jshopcore.model.item.BaseItem; +import org.mxchange.jshopcore.model.product.Product; /** * A general basket item diff --git a/src/org/mxchange/jshop/model/product/BaseProduct.java b/src/org/mxchange/jshopcore/model/product/BaseProduct.java similarity index 96% rename from src/org/mxchange/jshop/model/product/BaseProduct.java rename to src/org/mxchange/jshopcore/model/product/BaseProduct.java index bb2cb40..5faa9bf 100644 --- a/src/org/mxchange/jshop/model/product/BaseProduct.java +++ b/src/org/mxchange/jshopcore/model/product/BaseProduct.java @@ -3,11 +3,11 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.mxchange.jshop.model.product; +package org.mxchange.jshopcore.model.product; import java.text.MessageFormat; import java.util.Objects; -import org.mxchange.jshop.BaseShopCore; +import org.mxchange.jshopcore.BaseShopCore; /** * diff --git a/src/org/mxchange/jshop/model/product/Product.java b/src/org/mxchange/jshopcore/model/product/Product.java similarity index 95% rename from src/org/mxchange/jshop/model/product/Product.java rename to src/org/mxchange/jshopcore/model/product/Product.java index 75a0839..d0e46fb 100644 --- a/src/org/mxchange/jshop/model/product/Product.java +++ b/src/org/mxchange/jshopcore/model/product/Product.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.product; +package org.mxchange.jshopcore.model.product; -import org.mxchange.jshop.ShopInterface; +import org.mxchange.jshopcore.ShopInterface; /** * An interface for in database storable products diff --git a/src/org/mxchange/jshop/model/product/generic/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java similarity index 90% rename from src/org/mxchange/jshop/model/product/generic/GenericProduct.java rename to src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java index cad00b8..7fe9de6 100644 --- a/src/org/mxchange/jshop/model/product/generic/GenericProduct.java +++ b/src/org/mxchange/jshopcore/model/product/generic/GenericProduct.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jshop.model.product.generic; +package org.mxchange.jshopcore.model.product.generic; import java.text.MessageFormat; -import org.mxchange.jshop.model.product.BaseProduct; -import org.mxchange.jshop.model.product.Product; +import org.mxchange.jshopcore.model.product.BaseProduct; +import org.mxchange.jshopcore.model.product.Product; /** * Generic product class -- 2.39.2