]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Removed JSF again for this branch only jsp
authorRoland Haeder <roland@mxchange.org>
Wed, 2 Sep 2015 16:45:39 +0000 (18:45 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 2 Sep 2015 16:45:39 +0000 (18:45 +0200)
Signed-off-by:Roland Häder <roland@mxchange.org>

web/WEB-INF/faces-config.xml [deleted file]
web/WEB-INF/templates/base.tpl [deleted file]
web/WEB-INF/templates/guest/guest_footer.tpl [deleted file]
web/WEB-INF/templates/guest/guest_menu.tpl [deleted file]
web/WEB-INF/web.xml
web/index.xhtml [deleted file]
web/templates.dist/guest_page.xhtml [deleted file]

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
deleted file mode 100644 (file)
index 98b6793..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config version="2.2"
-                         xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-                         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
-</faces-config>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
deleted file mode 100644 (file)
index bfaffe8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-
-       <h:head>
-               <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-               <h:outputStylesheet name="./css/default.css"/>
-               <h:outputStylesheet name="./css/cssLayout.css"/>
-               <title>Pizza-Service - <ui:insert name="title">Default title</ui:insert></title>
-       </h:head>
-
-       <h:body>
-               <div id="top">
-                       <ui:insert name="top">
-                               <div id="header"> 
-                                       <div id="title">
-                                               <h1>Pizza-Service - <ui:insert name="title">Default title</ui:insert></h1>
-                                       </div>
-                               </div>
-                       </ui:insert>
-               </div>
-
-               <div id="menu_content">
-                       <div id="left">
-                               <ui:insert name="menu">Default menu</ui:insert>
-                       </div>
-
-                       <div id="content" class="left_content">
-                               <ui:insert name="content_header">Default content header</ui:insert>
-                               <ui:insert name="content">Default content</ui:insert>
-                       </div>
-
-                       <div class="clear"></div>
-               </div>
-
-               <div id="footer">
-                       <ui:insert name="footer">Default footer</ui:insert>
-               </div>
-       </h:body>
-</html>
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
deleted file mode 100644 (file)
index 6462748..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-       <div class="footer">
-               <ul class="footer_nav">
-                       <li><h:link outcome="index" value="Home" /></li>
-                       <li><h:link outcome="imprint" value="Impressum" /></li>
-                       <li><h:link outcome="terms" value="AGBs" /></li>
-                       <li><h:link outcome="privacy" value="Datenschutz" /></li>
-               </ul>
-       </div>
-
-       <div class="clear"></div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
deleted file mode 100644 (file)
index cfaaae0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<ui:composition
-       xmlns="http://www.w3.org/1999/xhtml"
-       xmlns:f="http://java.sun.com/jsf/core"
-       xmlns:h="http://java.sun.com/jsf/html"
-       xmlns:ui="http://java.sun.com/jsf/facelets">
-       <div class="menu">
-               <div class="menu_header">
-                       Home
-               </div>
-               <ul>
-                       <li><h:link title="Eingangsseite" outcome="index" value="Home" /></li>
-                       <li><h:link title="Zum Warenkorb" outcome="basket" value="Zum Warenkorb" /></li>
-                       <li><h:link title="Sitzung beennden" outcome="bye" value="Sitzung beenden" /></li>
-               </ul>
-
-               <div class="menu_header">
-                       Kundenlogin
-               </div>
-               <ul>
-                       <li><h:link title="Login für bestehende Kunden" outcome="customer_login" value="Einloggen" /></li>
-                       <li><h:link title="Anmeldung als neuer Kunde" outcome="customer_register" value="Neuer Kunde" /></li>
-                       <li><h:link title="Neues Passwort erstellen" outcome="customer_lost_passwd" value="Passwort vergessen?" /></li>
-               </ul>
-       </div>
-</ui:composition>
index 1d88bf7b44977260aa8862dda9ca52a2b84d3008..2a674a0acdb967354f1ea71866d8704aae373d90 100644 (file)
                <filter-name>Utf8ServletFilter</filter-name>
                <url-pattern>/*</url-pattern>
        </filter-mapping>
-       <servlet>
-               <servlet-name>Faces Servlet</servlet-name>
-               <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-       <servlet-mapping>
-               <servlet-name>Faces Servlet</servlet-name>
-               <url-pattern>/faces/*</url-pattern>
-       </servlet-mapping>
-       <mime-mapping>
-               <extension>tpl</extension>
-               <mime-type>text/plain</mime-type>
-       </mime-mapping>
        <session-config>
                <session-timeout>
                        30
diff --git a/web/index.xhtml b/web/index.xhtml
deleted file mode 100644 (file)
index 08cf9c6..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
-
-       <!--
-       TODO: Not used:
-       xmlns:basket="http://mxchange.org/jshop/tags/basket"
-       //-->
-
-       <ui:composition template="/WEB-INF/templates/base.tpl">
-               <ui:define name="title">Willkommen!</ui:define>
-
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       Eingangsseite (dummy)
-               </ui:define>
-
-               <ui:define name="content">
-                       <!--
-                       TODO Not used!
-                       <basket:mini_basket basket="#{basket}" />
-
-                       <h:panelGrid class="basket_item_table" columnClasses="table_data_column" headerClass="table_header_column">
-                               <f:facet name="header">
-                                       Bestellen? Bestellmenge: Produkt: Einzelpreis:
-                               </f:facet>
-                       </h:panelGrid>
-                       //-->
-
-                       <h:form acceptcharset="utf-8" id="add_item">
-                               <table class="basket_item_table">
-                                       <thead>
-                                               <tr>
-                                                       <th colspan="5" class="table_header">
-                                                               Folgendes kann bestellt werden:
-                                                       </th>
-                                               </tr>
-
-                                               <tr>
-                                                       <th class="table_header_column">
-                                                               Bestellen?
-                                                       </th>
-
-                                                       <th class="table_header_column">
-                                                               Anzahl:
-                                                       </th>
-
-                                                       <th class="table_header_column">
-                                                               Produkt:
-                                                       </th>
-
-                                                       <th class="table_header_column">
-                                                               Einzelpreis:
-                                                       </th>
-
-                                                       <th class="table_header_column">
-                                                               Zwischensumme:
-                                                       </th>
-                                               </tr>
-                                       </thead>
-
-                                       <tbody>
-                                               <ui:repeat var="product" value="#{controller.availableProducts}">
-                                                       <!-- Cache isAdded call to reduce calls //-->
-                                                       <c:set var="isAdded" value="#{basket.isAdded(product)}" />
-
-                                                       <ui:fragment rendered="#{isAdded == true}">
-                                                               <tr>
-                                                                       <td class="table_data_column">
-                                                                               <h:link outcome="basket" title="Zum Warenkorb" value="Warenkorb" />
-                                                                       </td>
-
-                                                                       <td class="table_data_column">
-                                                                               #{basket.item.amount}
-                                                                       </td>
-
-                                                                       <td class="table_data_column">
-                                                                               #{product.title}
-                                                                       </td>
-
-                                                                       <td class="table_data_column" align="right">
-                                                                               <h:outputText class="price" value="#{product.price}">
-                                                                                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
-                                                                               </h:outputText>
-                                                                       </td>
-
-                                                                       <td class="table_data_column" align="right">
-                                                                               <h:outputText class="price" value="#{basket.item.calculateTotalPrice()}">
-                                                                                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
-                                                                               </h:outputText>
-                                                                       </td>
-                                                               </tr>
-                                                       </ui:fragment>
-
-                                                       <ui:fragment rendered="#{isAdded == false}">
-                                                               <tr>
-                                                                       <td class="table_data_column">
-                                                                               <h:commandButton class="submit" id="add" value="Hinzufügen" action="#{basket.addToBasket(product)}" />
-                                                                               <h:inputHidden id="itemId" value="#{product.itemId}" />
-                                                                               <h:inputHidden id="itemType" value="Product" />
-                                                                       </td>
-
-                                                                       <td class="table_data_column">
-                                                                               <h:inputText class="input" id="amount" size="3" maxlength="20" />
-                                                                       </td>
-
-                                                                       <td class="table_data_column">
-                                                                               #{product.title}
-                                                                       </td>
-
-                                                                       <td class="table_data_column" align="right">
-                                                                               <h:outputText class="price" value="#{product.price}">
-                                                                                       <f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" />
-                                                                               </h:outputText>
-                                                                       </td>
-
-                                                                       <td class="table_data_column" align="right">
-                                                                               -
-                                                                       </td>
-                                                               </tr>
-                                                       </ui:fragment>
-                                               </ui:repeat>
-                                       </tbody>
-                               </table>
-                       </h:form>
-               </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/templates.dist/guest_page.xhtml b/web/templates.dist/guest_page.xhtml
deleted file mode 100644 (file)
index 7d67185..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
-
-       <f:metadata>
-               <f:viewAction action="#{controller.init()}" />
-       </f:metadata>
-
-       <c:set var="basePath" value="#{request.contextPath}" />
-
-       <ui:composition template="/WEB-INF/templates/base.tpl">
-               <ui:define name="title">Your page's title here</ui:define>
-
-               <ui:define name="menu">
-                       <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
-               </ui:define>
-
-               <ui:define name="content_header">
-                       Your header above content here
-               </ui:define>
-
-               <ui:define name="content">
-                       Here goes your content.
-               </ui:define>
-
-               <ui:define name="footer">
-                       <ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
-               </ui:define>
-       </ui:composition>
-</html>