More cleanups + added source path for jshop (you need to do the same)

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 851aac70e7598dc377f6c841c3b685b1e96aa50a..a995cf0fddbdbd9ade5036d69b7623960ddb3620 100644 (file)
--- 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 3485e12ae0993ed1f28842db5713e1e165af8d15..3412c14ed6159c1ec1cc216501ef959e152359b8 100644 (file)
--- 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 105b5fabcd80e09e94f63195a1fea46099afd6ab..50d14122952222ba82beaf2626d346cd122b0ab7 100644 (file)
--- 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 81029241d595afa72ab3a9c7e14aef919977ebb6..a69dec3aa1bc31298fe79e9336eb1f2d2cb29dfa 100644 (file)
--- 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 4e55adb7583663e39dc9391eb8cff4525cfab5d6..582596c818e54471c71c65a6c0cae96d43d7f25a 100644 (file)
--- 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 49dfc442fd2f56a52676ee8bccd42a10b10744cd..8a5b4cd95a0d05a280d86bacf5ff1dfdec180744 100644 (file)
--- 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 16bfc1ca3925e72f3de1e587540d4117a454ad1c..2099ff7f75ca4a0b42ffc918a61a14278cbe01f0 100644 (file)
--- 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 62332e3434b255f41d8ec6963e7cc1162df4f2c3..2828b1479ce5103a1893cb0cb51d4d09549c7da6 100644 (file)
--- 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 51b05ccfe096ecada4dc8b8e2245e270ea022d8a..1db991ef425af001e8b29684032b7d9073b97f0a 100644 (file)
--- 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 4829004bd340b5be388709353d10eff75e283ab3..3482f032fd2e4a5fdb565f685d8819ea90ef07d2 100644 (file)
--- 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)%>>
        <%