From: Roland Haeder Date: Tue, 8 Sep 2015 20:45:02 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8ff7ded93d58c588fa28e442f6970e4547c14d53;p=jshop-lib.git Continued: - had to put all classes and interfaces in one package jar-wide ... :-( - updated jcore.jar, jcoreee.jar Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index 7318d47..217c364 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f479cd8..9f0039f 100644 Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ diff --git a/lib/jshop-core.jar b/lib/jshop-core.jar index 9965f38..3772ba4 100644 Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 4c1276d..f65ba54 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -921,6 +921,14 @@ is divided into following sections: + + + + + + + + @@ -1406,6 +1414,14 @@ is divided into following sections: + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index bdd86e7..9431885 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=4a3637b0 +build.xml.data.CRC32=890671fc build.xml.script.CRC32=7a07e688 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=4a3637b0 -nbproject/build-impl.xml.script.CRC32=4eec5454 +nbproject/build-impl.xml.data.CRC32=890671fc +nbproject/build-impl.xml.script.CRC32=d964ec0e nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index dedc590..c5fb60c 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -39,6 +39,7 @@ jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.jcore.jar}:\ + ${reference.jcore-ee-logger.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ ${libs.javaee-api-7.0.classpath} @@ -81,7 +82,9 @@ manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=true platform.active=default_platform +project.jcore-ee-logger=../jcore-ee-logger project.license=gpl30 +reference.jcore-ee-logger.jar=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar run.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/nbproject/project.xml b/nbproject/project.xml index 1f83014..9cd0bf1 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -14,5 +14,15 @@ ./lib/nblibraries.properties + + + jcore-ee-logger + jar + + jar + clean + jar + + diff --git a/src/org/mxchange/jcore/model/contact/gender/GenderSessionBeanRemote.java b/src/org/mxchange/jcore/model/contact/gender/GenderSessionBeanRemote.java new file mode 100644 index 0000000..3cdbb49 --- /dev/null +++ b/src/org/mxchange/jcore/model/contact/gender/GenderSessionBeanRemote.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jcore.model.contact.gender; + +import java.io.Serializable; +import java.util.List; +import javax.ejb.Remote; + +/** + * A remote interface for static shop data + * + * @author Roland Haeder + */ +@Remote +public interface GenderSessionBeanRemote extends Serializable { + + /** + * Getter for all genders as array + * + * @return All genders as array + */ + public Gender[] allGenders (); + + /** + * All selectable genders. This excludes UNKNOWN + * + * @return Selectable gender for the user + */ + public List selectableGenders (); +} diff --git a/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java new file mode 100644 index 0000000..de3f3a1 --- /dev/null +++ b/src/org/mxchange/jshopcore/model/basket/BasketSessionBeanRemote.java @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.basket; + +import java.io.Serializable; +import java.rmi.RemoteException; +import java.util.Map; +import javax.ejb.Remote; + +/** + * An interface for a basket bean + * + * @author Roland Haeder + */ +@Remote +public interface BasketSessionBeanRemote extends Serializable { + /** + * Adds given item instance to this basket + * @param item Item instance to add + * @throws java.rmi.RemoteException If something bad happens + */ + public void addItem (final AddableBasketItem item) throws RemoteException; + + /** + * Adds given item instance to basket. Remember that the product instance + * itself is not added. Instead a AddableBasketItem is created which holds + * information about amoutn and item type. + * + * @param item Item instance + * @throws java.rmi.RemoteException If something bad happens + */ + public void addToBasket (final AddableBasketItem item) throws RemoteException; + + /** + * Checks if the basket is empty + * + * @return Whether the basket is empty + * @throws java.rmi.RemoteException If something bad happens + */ + public boolean isEmpty () throws RemoteException; + + /** + * Checks whether the given product as already been added. If the product's + * item id number was found in basket, the corresponding item instance will be set + * + * @param item Item instance to check + * @return Whether the given item has been found + * @throws java.rmi.RemoteException If something bad happens + */ + public boolean isAdded (final AddableBasketItem item) throws RemoteException; + + /** + * Some "getter" for all entries in this basket + * + * @return Map on all basket items + * @throws java.rmi.RemoteException If something bad happens + */ + public Map getAll () throws RemoteException; + + /** + * Getter for last entry + * + * @return Last added item in basket + * @throws java.rmi.RemoteException If something bad happens + */ + public AddableBasketItem getLast () throws RemoteException; + + /** + * Getter for last num rows + * + * @return Last num rows + */ + public int getLastNumRows (); +} diff --git a/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java b/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java new file mode 100644 index 0000000..9958060 --- /dev/null +++ b/src/org/mxchange/jshopcore/model/category/AdminCategorySessionBeanRemote.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.category; + +import java.io.Serializable; +import java.rmi.RemoteException; +import javax.ejb.Remote; +import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; + +/** + * An interface for categories for "ADMIN" role + *. + * @author Roland Haeder + */ +@Remote +public interface AdminCategorySessionBeanRemote extends Serializable { + + /** + * Adds given category data from request to database + * + * @param category Category instance + * @throws java.rmi.RemoteException If something unexpected happened + * @throws org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException If the given title is already used + */ + public void doAdminAddCategory (final Category category) throws RemoteException, CategoryTitleAlreadyUsedException; +} diff --git a/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java b/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java new file mode 100644 index 0000000..f5f157c --- /dev/null +++ b/src/org/mxchange/jshopcore/model/category/CategorySessionBeanRemote.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.category; + +import java.io.Serializable; +import java.rmi.RemoteException; +import java.util.Deque; +import javax.ejb.Remote; + +/** + * A remote-call interface for the shop + * + * @author Roland Haeder + */ +@Remote +public interface CategorySessionBeanRemote extends Serializable { + + /** + * Some "getter" for a linked list of all categories + * + * @return All categories + * @throws java.rmi.RemoteException If anything went wrong + */ + public Deque getAllCategories () throws RemoteException; +} diff --git a/src/org/mxchange/jshopcore/model/customer/CustomerSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/customer/CustomerSessionBeanRemote.java new file mode 100644 index 0000000..57cd728 --- /dev/null +++ b/src/org/mxchange/jshopcore/model/customer/CustomerSessionBeanRemote.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.customer; + +import java.io.Serializable; +import javax.ejb.Remote; + +/** + * An interface for customer beans + * + * @author Roland Haeder + */ +@Remote +public interface CustomerSessionBeanRemote extends Serializable { +} diff --git a/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java new file mode 100644 index 0000000..b07c3c5 --- /dev/null +++ b/src/org/mxchange/jshopcore/model/product/AdminProductSessionBeanRemote.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.product; + +import java.io.Serializable; +import java.rmi.RemoteException; +import java.util.Deque; +import javax.ejb.Remote; +import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; + +/** + * Product interface for "ADMIN" role + * + * @author Roland Haeder + */ +@Remote +public interface AdminProductSessionBeanRemote extends Serializable { + + /** + * Some "getter" for a linked list of all products + * + * @return All products + * @throws java.rmi.RemoteException If anything went wrong + */ + public Deque getAllProducts () throws RemoteException; + + /** + * Adds given product data from request to database + * + * @param product Product instance + * @throws java.rmi.RemoteException If something unexpected happened + * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the given product title is already used + */ + public void doAdminAddProduct (final Product product) throws RemoteException, ProductTitleAlreadyUsedException; +} diff --git a/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java b/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java new file mode 100644 index 0000000..cba7829 --- /dev/null +++ b/src/org/mxchange/jshopcore/model/product/ProductSessionBeanRemote.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.jshopcore.model.product; + +import java.io.Serializable; +import java.rmi.RemoteException; +import java.util.Deque; +import javax.ejb.Remote; + +/** + * An interface for non-admin purposes + * + * @author Roland Haeder + */ +@Remote +public interface ProductSessionBeanRemote extends Serializable { + + /** + * Some "getter" for a linked list of only available products + * + * @return Only available products + * @throws java.rmi.RemoteException If anything went wrong + */ + public Deque getAvailableProducts () throws RemoteException; +} diff --git a/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java deleted file mode 100644 index c0c823b..0000000 --- a/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jshopejb.beans.remote.basket; - -import java.io.Serializable; -import java.rmi.RemoteException; -import java.util.Map; -import javax.ejb.Remote; -import org.mxchange.jshopcore.model.item.AddableBasketItem; - -/** - * An interface for a basket bean - * - * @author Roland Haeder - */ -@Remote -public interface BasketSessionBeanRemote extends Serializable { - /** - * Adds given item instance to this basket - * @param item Item instance to add - * @throws java.rmi.RemoteException If something bad happens - */ - public void addItem (final AddableBasketItem item) throws RemoteException; - - /** - * Adds given item instance to basket. Remember that the product instance - * itself is not added. Instead a AddableBasketItem is created which holds - * information about amoutn and item type. - * - * @param item Item instance - * @throws java.rmi.RemoteException If something bad happens - */ - public void addToBasket (final AddableBasketItem item) throws RemoteException; - - /** - * Checks if the basket is empty - * - * @return Whether the basket is empty - * @throws java.rmi.RemoteException If something bad happens - */ - public boolean isEmpty () throws RemoteException; - - /** - * Checks whether the given product as already been added. If the product's - * item id number was found in basket, the corresponding item instance will be set - * - * @param item Item instance to check - * @return Whether the given item has been found - * @throws java.rmi.RemoteException If something bad happens - */ - public boolean isAdded (final AddableBasketItem item) throws RemoteException; - - /** - * Some "getter" for all entries in this basket - * - * @return Map on all basket items - * @throws java.rmi.RemoteException If something bad happens - */ - public Map getAll () throws RemoteException; - - /** - * Getter for last entry - * - * @return Last added item in basket - * @throws java.rmi.RemoteException If something bad happens - */ - public AddableBasketItem getLast () throws RemoteException; - - /** - * Getter for last num rows - * - * @return Last num rows - */ - public int getLastNumRows (); -} diff --git a/src/org/mxchange/jshopejb/beans/remote/customer/CustomerSessionBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/customer/CustomerSessionBeanRemote.java deleted file mode 100644 index 7beb9f8..0000000 --- a/src/org/mxchange/jshopejb/beans/remote/customer/CustomerSessionBeanRemote.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jshopejb.beans.remote.customer; - -import java.io.Serializable; -import javax.ejb.Remote; - -/** - * An interface for customer beans - * - * @author Roland Haeder - */ -@Remote -public interface CustomerSessionBeanRemote extends Serializable { -} diff --git a/src/org/mxchange/jshopejb/beans/remote/data/ShopDataBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/data/ShopDataBeanRemote.java deleted file mode 100644 index 0b12b25..0000000 --- a/src/org/mxchange/jshopejb/beans/remote/data/ShopDataBeanRemote.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jshopejb.beans.remote.data; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Remote; -import org.mxchange.jcore.model.contact.gender.Gender; - -/** - * A remote interface for static shop data - * - * @author Roland Haeder - */ -@Remote -public interface ShopDataBeanRemote extends Serializable { - - /** - * Getter for all genders as array - * - * @return All genders as array - */ - public Gender[] allGenders (); - - /** - * All selectable genders. This excludes UNKNOWN - * - * @return Selectable gender for the user - */ - public List selectableGenders (); -} diff --git a/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java deleted file mode 100644 index ab0b94c..0000000 --- a/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jshopejb.beans.remote.shop; - -import java.io.Serializable; -import java.rmi.RemoteException; -import java.util.Deque; -import javax.ejb.Remote; -import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; -import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; -import org.mxchange.jshopcore.model.category.Category; -import org.mxchange.jshopcore.model.product.Product; - -/** - * A remote-call interface for the shop - * - * @author Roland Haeder - */ -@Remote -public interface ShopSessionBeanRemote extends Serializable { - - /** - * Some "getter" for a linked list of only available products - * - * @return Only available products - * @throws java.rmi.RemoteException If anything went wrong - */ - public Deque getAvailableProducts () throws RemoteException; - - /** - * Some "getter" for a linked list of all products - * - * @return All products - * @throws java.rmi.RemoteException If anything went wrong - */ - public Deque getAllProducts () throws RemoteException; - - /** - * Some "getter" for a linked list of all categories - * - * @return All categories - * @throws java.rmi.RemoteException If anything went wrong - */ - public Deque getAllCategories () throws RemoteException; - - /** - * Adds given category data from request to database - * - * @param category Category instance - * @throws java.rmi.RemoteException If something unexpected happened - * @throws org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException If the given title is already used - */ - public void doAdminAddCategory (final Category category) throws RemoteException, CategoryTitleAlreadyUsedException; - - /** - * Adds given product data from request to database - * - * @param product Product instance - * @throws java.rmi.RemoteException If something unexpected happened - * @throws org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException If the given product title is already used - */ - public void doAdminAddProduct (final Product product) throws RemoteException, ProductTitleAlreadyUsedException; -}