New location (but will be renamed/moved later anyway)

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

diff --git a/web/WEB-INF/static/admin/admin_category_selection_box.jsp b/web/WEB-INF/static/admin/admin_category_selection_box.jsp
new file mode 100644 (file)
index 0000000..e1d2bec
--- /dev/null
+++ b/web/WEB-INF/static/admin/admin_category_selection_box.jsp
@@ -0,0 +1,16 @@
+<%-- 
+       Document   : admin_category_selection_box
+       Created on : 14.08.2015, 12:51:05
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@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="PizzaBean" />
+
+<select class="select" name="categoryId" size="1">
+       <c:forEach var="category" items="${controller.allCategoriesIterator}">
+               <option value="${category.categoryId}">${category.decodedTitle}</option>
+       </c:forEach>
+</select>

diff --git a/web/WEB-INF/static/admin/admin_footer.jsp b/web/WEB-INF/static/admin/admin_footer.jsp
new file mode 100644 (file)
index 0000000..aa6b21b
--- /dev/null
+++ b/web/WEB-INF/static/admin/admin_footer.jsp
@@ -0,0 +1,16 @@
+<%-- 
+       Document   : admin_footer
+       Created on : 11.08.2015, 12:28:03
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<c:set var="basePath" value="${pageContext.request.contextPath}" />
+
+<div class="footer">
+       <ul class="footer_nav">
+               <li><a href="${basePath}/">Zur Webseite</a></li>
+       </ul>
+</div>
+
+<div class="clear"></div>

diff --git a/web/WEB-INF/static/admin/admin_menu.jsp b/web/WEB-INF/static/admin/admin_menu.jsp
new file mode 100644 (file)
index 0000000..9250428
--- /dev/null
+++ b/web/WEB-INF/static/admin/admin_menu.jsp
@@ -0,0 +1,21 @@
+<%-- 
+       Document   : admin_menu
+       Created on : 06.08.2015, 12:41:44
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<c:set var="basePath" value="${pageContext.request.contextPath}" />
+
+<div id="menu">
+       <ul>
+               <li><a href="${basePath}/admin/" title="Eingangsseite">Home</a></li>
+               <li><a href="${basePath}/admin/category.jsp" title="Kazegorie">Kategorie</a></li>
+               <li><a href="${basePath}/admin/product.jsp" title="Produkt">Produkt</a></li>
+       </ul>
+
+       <ul>
+               <li><a href="${basePath}/admin/logout.jsp" title="Ausloggen">Ausloggen</a></li>
+               <li><a href="${basePath}/" title="Zur Webseite, aber eingeloggt bleiben">Webseite aufrufen</a></li>
+       </ul>
+</div>

diff --git a/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp b/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp
new file mode 100644 (file)
index 0000000..c00a925
--- /dev/null
+++ b/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp
@@ -0,0 +1,17 @@
+<%-- 
+       Document   : admin_parent_category_selection_box
+       Created on : 14.08.2015, 12:51:05
+       Author     : Roland Haeder
+--%>
+
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@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="PizzaBean" />
+
+<select class="select" name="parentId" size="1">
+       <option value="">Ist oberste Kategorie</option>
+       <c:forEach var="category" items="${controller.allCategoriesIterator}">
+               <option value="${category.categoryId}">${category.decodedTitle}</option>
+       </c:forEach>
+</select>

diff --git a/web/admin/category.jsp b/web/admin/category.jsp
index b6bef59914d620afe700c413099420731faa369d..23cca2b44314d244b93d0ef616e86db66cb9df6e 100644 (file)
--- a/web/admin/category.jsp
+++ b/web/admin/category.jsp
@@ -37,7 +37,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -119,7 +119,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <jsp:include flush="false" page="/static/admin/admin_parent_category_selection_box.jsp" />
+                                                                       <jsp:include flush="false" page="/WEB-INF/static/admin/admin_parent_category_selection_box.jsp" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -136,6 +136,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/admin/index.jsp b/web/admin/index.jsp
index 05c28e9a49422ad1de82654f0ebe5828272b5268..cd88ed7d9a18ad2e284ad006ff1447e34c320c4c 100644 (file)
--- a/web/admin/index.jsp
+++ b/web/admin/index.jsp
@@ -31,7 +31,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -43,6 +43,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/admin/product.jsp b/web/admin/product.jsp
index c8c002316e2646e4a576960f61f83641e599477b..aeb5747fa9d92f5f7f7f36154d90d6d9dc4e2069 100644 (file)
--- a/web/admin/product.jsp
+++ b/web/admin/product.jsp
@@ -36,7 +36,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_menu.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -142,7 +142,7 @@
                                                                </div>
 
                                                                <div class="table_right">
-                                                                       <jsp:include flush="false" page="/static/admin/admin_category_selection_box.jsp" />
+                                                                       <jsp:include flush="false" page="/WEB-INF/static/admin/admin_category_selection_box.jsp" />
                                                                </div>
 
                                                                <div class="clear"></div>
@@ -183,6 +183,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/admin/admin_footer.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/admin/admin_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/bye.xhtml b/web/bye.xhtml
index 167737b9f6c3f9e0f3ede90e77f170dfb40ab8e2..5fa74e36b2af1d418e9c733e0d99d02d0bcfd268 100644 (file)
--- a/web/bye.xhtml
+++ b/web/bye.xhtml
@@ -21,7 +21,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -44,6 +44,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/errorHandler.xhtml b/web/errorHandler.xhtml
index 10212611a03ffddac843875e8a7cf692aeb2b12b..62d3da890c91f6fa38d379696cea006dccb49c11 100644 (file)
--- a/web/errorHandler.xhtml
+++ b/web/errorHandler.xhtml
@@ -27,7 +27,7 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/guest/guest_menu.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/guest/guest_menu.jsp" flush="false" />
 
                <div id="content_outer">
                        <div id="content_title">
@@ -47,6 +47,6 @@
                        </div>
                </div>
 
-               <jsp:include page="/static/guest/guest_footer.jsp" flush="false" />
+               <jsp:include page="/WEB-INF/static/guest/guest_footer.jsp" flush="false" />
        </body>
 </html>

diff --git a/web/static/admin/admin_category_selection_box.jsp b/web/static/admin/admin_category_selection_box.jsp
deleted file mode 100644 (file)
index e1d2bec..0000000
--- a/web/static/admin/admin_category_selection_box.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%-- 
-       Document   : admin_category_selection_box
-       Created on : 14.08.2015, 12:51:05
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@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="PizzaBean" />
-
-<select class="select" name="categoryId" size="1">
-       <c:forEach var="category" items="${controller.allCategoriesIterator}">
-               <option value="${category.categoryId}">${category.decodedTitle}</option>
-       </c:forEach>
-</select>

diff --git a/web/static/admin/admin_footer.jsp b/web/static/admin/admin_footer.jsp
deleted file mode 100644 (file)
index aa6b21b..0000000
--- a/web/static/admin/admin_footer.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<%-- 
-       Document   : admin_footer
-       Created on : 11.08.2015, 12:28:03
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<div class="footer">
-       <ul class="footer_nav">
-               <li><a href="${basePath}/">Zur Webseite</a></li>
-       </ul>
-</div>
-
-<div class="clear"></div>

diff --git a/web/static/admin/admin_menu.jsp b/web/static/admin/admin_menu.jsp
deleted file mode 100644 (file)
index 9250428..0000000
--- a/web/static/admin/admin_menu.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%-- 
-       Document   : admin_menu
-       Created on : 06.08.2015, 12:41:44
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<c:set var="basePath" value="${pageContext.request.contextPath}" />
-
-<div id="menu">
-       <ul>
-               <li><a href="${basePath}/admin/" title="Eingangsseite">Home</a></li>
-               <li><a href="${basePath}/admin/category.jsp" title="Kazegorie">Kategorie</a></li>
-               <li><a href="${basePath}/admin/product.jsp" title="Produkt">Produkt</a></li>
-       </ul>
-
-       <ul>
-               <li><a href="${basePath}/admin/logout.jsp" title="Ausloggen">Ausloggen</a></li>
-               <li><a href="${basePath}/" title="Zur Webseite, aber eingeloggt bleiben">Webseite aufrufen</a></li>
-       </ul>
-</div>

diff --git a/web/static/admin/admin_parent_category_selection_box.jsp b/web/static/admin/admin_parent_category_selection_box.jsp
deleted file mode 100644 (file)
index c00a925..0000000
--- a/web/static/admin/admin_parent_category_selection_box.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%-- 
-       Document   : admin_parent_category_selection_box
-       Created on : 14.08.2015, 12:51:05
-       Author     : Roland Haeder
---%>
-
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@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="PizzaBean" />
-
-<select class="select" name="parentId" size="1">
-       <option value="">Ist oberste Kategorie</option>
-       <c:forEach var="category" items="${controller.allCategoriesIterator}">
-               <option value="${category.categoryId}">${category.decodedTitle}</option>
-       </c:forEach>
-</select>