From: Roland Haeder <roland@mxchange.org>
Date: Tue, 8 Sep 2015 13:40:01 +0000 (+0200)
Subject: More cleanup
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a242220cbebc16ef6a60b0aac44770f77a3e2d53;p=jcustomer-lib.git
More cleanup
Signed-off-by:Roland Häder <roland@mxchange.org>
---
diff --git a/lib/jcore.jar b/lib/jcore.jar
index 1e4a78b..7318d47 100644
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ
diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 8ca2e65..f479cd8 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 9ee0879..9965f38 100644
Binary files a/lib/jshop-core.jar and b/lib/jshop-core.jar differ
diff --git a/lib/log4j-api-2.3.jar b/lib/log4j-api-2.3.jar
deleted file mode 100644
index 2a61bbe..0000000
Binary files a/lib/log4j-api-2.3.jar and /dev/null differ
diff --git a/lib/log4j-core-2.3.jar b/lib/log4j-core-2.3.jar
deleted file mode 100644
index 5438b0b..0000000
Binary files a/lib/log4j-core-2.3.jar and /dev/null differ
diff --git a/nbproject/project.properties b/nbproject/project.properties
index d23c389..dedc590 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -33,8 +33,6 @@ excludes=
file.reference.jcore.jar=lib/jcore.jar
file.reference.jcoreee.jar=lib/jcoreee.jar
file.reference.jshop-core.jar=lib/jshop-core.jar
-file.reference.log4j-api-2.3.jar=lib/log4j-api-2.3.jar
-file.reference.log4j-core-2.3.jar=lib/log4j-core-2.3.jar
includes=**
jar.archive.disabled=${jnlp.enabled}
jar.compress=false
@@ -43,8 +41,6 @@ javac.classpath=\
${file.reference.jcore.jar}:\
${file.reference.jcoreee.jar}:\
${file.reference.jshop-core.jar}:\
- ${file.reference.log4j-api-2.3.jar}:\
- ${file.reference.log4j-core-2.3.jar}:\
${libs.javaee-api-7.0.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
diff --git a/src/org/mxchange/jshopeelib/beans/remote/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopeelib/beans/remote/basket/BasketSessionBeanRemote.java
deleted file mode 100644
index e2bb568..0000000
--- a/src/org/mxchange/jshopeelib/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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopeelib.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<Long, AddableBasketItem> 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/jshopeelib/beans/remote/customer/CustomerSessionBeanRemote.java b/src/org/mxchange/jshopeelib/beans/remote/customer/CustomerSessionBeanRemote.java
deleted file mode 100644
index 2644ed9..0000000
--- a/src/org/mxchange/jshopeelib/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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopeelib.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/jshopeelib/beans/remote/data/ShopDataBeanRemote.java b/src/org/mxchange/jshopeelib/beans/remote/data/ShopDataBeanRemote.java
deleted file mode 100644
index 203a8e7..0000000
--- a/src/org/mxchange/jshopeelib/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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopeelib.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<Gender> selectableGenders ();
-}
diff --git a/src/org/mxchange/jshopeelib/beans/remote/shop/ShopSessionBeanRemote.java b/src/org/mxchange/jshopeelib/beans/remote/shop/ShopSessionBeanRemote.java
deleted file mode 100644
index 7181d17..0000000
--- a/src/org/mxchange/jshopeelib/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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.jshopeelib.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<Product> 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<Product> 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<Category> 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;
-}
diff --git a/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java
new file mode 100644
index 0000000..c0c823b
--- /dev/null
+++ b/src/org/mxchange/jshopejb/beans/remote/basket/BasketSessionBeanRemote.java
@@ -0,0 +1,89 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+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<Long, AddableBasketItem> 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
new file mode 100644
index 0000000..7beb9f8
--- /dev/null
+++ b/src/org/mxchange/jshopejb/beans/remote/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 <http://www.gnu.org/licenses/>.
+ */
+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
new file mode 100644
index 0000000..0b12b25
--- /dev/null
+++ b/src/org/mxchange/jshopejb/beans/remote/data/ShopDataBeanRemote.java
@@ -0,0 +1,45 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+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<Gender> selectableGenders ();
+}
diff --git a/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java b/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java
new file mode 100644
index 0000000..ab0b94c
--- /dev/null
+++ b/src/org/mxchange/jshopejb/beans/remote/shop/ShopSessionBeanRemote.java
@@ -0,0 +1,77 @@
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+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<Product> 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<Product> 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<Category> 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;
+}