From df47a800a6f9f88fae9f6460a5885a133748cee3 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Mon, 31 Aug 2015 11:07:31 +0200
Subject: [PATCH] =?utf8?q?More=20cleanups=20+=20added=20source=20path=20fo?=
 =?utf8?q?r=20jshop=20(you=20need=20to=20do=20the=20same)=20Signed-off-by:?=
 =?utf8?q?Roland=20H=C3=A4der=20<roland@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 nbproject/project.properties                             | 1 +
 web/admin/category.jsp                                   | 8 ++++++--
 web/admin/index.jsp                                      | 2 +-
 web/admin/product.jsp                                    | 8 ++++++--
 web/form_handler/add_item.jsp                            | 8 ++++++--
 web/form_handler/admin/do_category.jsp                   | 6 +++---
 web/form_handler/admin/do_product.jsp                    | 4 ++--
 web/static/admin/admin_category_selection_box.jsp        | 2 +-
 web/static/admin/admin_parent_category_selection_box.jsp | 2 +-
 web/static/gender_selection_box.jsp                      | 2 +-
 10 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 851aac70..a995cf0f 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -103,6 +103,7 @@ source.encoding=UTF-8
 source.reference.commons-codec-1.10.jar=/home/quix0r/public_html/JARs/commons-codec-1.10-sources.jar
 source.reference.jcore.jar=../jcore/src
 source.reference.jsfcore.jar=../jsfcore/src
+source.reference.jshop.jar=../jshop/src/
 source.reference.log4j-web-2.3.jar=../../../JARs/log4j-web-2.3-sources.jar
 source.root=src
 src.dir=${source.root}/java
diff --git a/web/admin/category.jsp b/web/admin/category.jsp
index 3485e12a..3412c14e 100644
--- a/web/admin/category.jsp
+++ b/web/admin/category.jsp
@@ -11,11 +11,15 @@
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <jsp:setProperty name="controller" property="application" value="${pageContext.servletContext}" />
 <jsp:setProperty name="controller" property="basket" value="${basket}" />
-<%controller.init();%>
+
+<%
+	// TODO: Can be removed later
+	controller.init();
+%>
 
 <c:set var="basePath" value="${pageContext.request.contextPath}" />
 
diff --git a/web/admin/index.jsp b/web/admin/index.jsp
index 105b5fab..50d14122 100644
--- a/web/admin/index.jsp
+++ b/web/admin/index.jsp
@@ -11,7 +11,7 @@
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
 <%@page import="org.mxchange.jshop.product.Product"%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <c:set var="basePath" value="${pageContext.request.contextPath}" />
diff --git a/web/admin/product.jsp b/web/admin/product.jsp
index 81029241..a69dec3a 100644
--- a/web/admin/product.jsp
+++ b/web/admin/product.jsp
@@ -14,10 +14,14 @@
 <%@page import="org.mxchange.jshop.database.frontend.product.ProductFrontend"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <jsp:setProperty name="controller" property="application" value="${pageContext.servletContext}" />
-<%controller.init();%>
+
+<%
+	// TODO: Can be removed later
+	controller.init();
+%>
 
 <c:set var="basePath" value="${pageContext.request.contextPath}" />
 
diff --git a/web/form_handler/add_item.jsp b/web/form_handler/add_item.jsp
index 4e55adb7..582596c8 100644
--- a/web/form_handler/add_item.jsp
+++ b/web/form_handler/add_item.jsp
@@ -11,11 +11,15 @@
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
 <%@page import="org.mxchange.jshop.item.AddableBasketItem"%>
 
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <jsp:setProperty name="controller" property="application" value="${pageContext.servletContext}" />
 <jsp:setProperty name="controller" property="basket" value="${basket}" />
-<%controller.init();%>
+
+<%
+	// TODO: Can be removed later
+	controller.init();
+%>
 
 <jsp:useBean id="item" scope="request" class="org.mxchange.jshop.item.basket.BasketItem" type="AddableBasketItem" />
 <jsp:setProperty name="item" property="*" />
diff --git a/web/form_handler/admin/do_category.jsp b/web/form_handler/admin/do_category.jsp
index 49dfc442..8a5b4cd9 100644
--- a/web/form_handler/admin/do_category.jsp
+++ b/web/form_handler/admin/do_category.jsp
@@ -9,9 +9,9 @@
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.customer.CustomerBean" %>
-<%@page import="org.mxchange.pizzaapplication.product.Product"%>
-<%@page import="org.mxchange.pizzaapplication.exceptions.CategoryTitleAlreadyUsedException"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<%@page import="org.mxchange.jshop.product.Product"%>
+<%@page import="org.mxchange.jshop.exceptions.CategoryTitleAlreadyUsedException"%>
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <c:set var="basePath" value="${pageContext.request.contextPath}" />
diff --git a/web/form_handler/admin/do_product.jsp b/web/form_handler/admin/do_product.jsp
index 16bfc1ca..2099ff7f 100644
--- a/web/form_handler/admin/do_product.jsp
+++ b/web/form_handler/admin/do_product.jsp
@@ -9,8 +9,8 @@
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.customer.CustomerBean" %>
-<%@page import="org.mxchange.pizzaapplication.product.Product"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<%@page import="org.mxchange.jshop.product.Product"%>
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <c:set var="basePath" value="${pageContext.request.contextPath}" />
diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp
index 62332e34..2828b147 100644
--- a/web/static/admin/admin_category_selection_box.jsp
+++ b/web/static/admin/admin_category_selection_box.jsp
@@ -8,7 +8,7 @@
 <%@page import="org.mxchange.jshop.database.frontend.category.CategoryFrontend"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <select class="select" name="<%=CategoryFrontend.COLUMN_ID%>" size="1">
 	<c:forEach var="category" items="${controller.allCategories}">
diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp
index 51b05ccf..1db991ef 100644
--- a/web/static/admin/admin_parent_category_selection_box.jsp
+++ b/web/static/admin/admin_parent_category_selection_box.jsp
@@ -8,7 +8,7 @@
 <%@page import="org.mxchange.jshop.database.frontend.category.CategoryFrontend"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%>
 <%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%>
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <select class="select" name="<%=CategoryFrontend.COLUMN_PARENT%>" size="1">
 	<option value="">Ist oberste Kategorie</option>
diff --git a/web/static/gender_selection_box.jsp b/web/static/gender_selection_box.jsp
index 4829004b..3482f032 100644
--- a/web/static/gender_selection_box.jsp
+++ b/web/static/gender_selection_box.jsp
@@ -9,7 +9,7 @@
 <%@page import="org.mxchange.pizzaapplication.beans.customer.CustomerBean" %>
 
 <jsp:useBean id="customer" scope="session" class="org.mxchange.pizzaapplication.beans.customer.PizzaServiceCustomerBean" type="CustomerBean" />
-<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="org.mxchange.pizzaapplication.beans.controller.PizzaBean" />
+<jsp:useBean id="controller" scope="session" class="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean" type="PizzaBean" />
 
 <select class="select" name="gender" id="gender" size="1" <%=controller.getDisabledHtmlFromSession(request, session)%>>
 	<%
-- 
2.39.5