From: Roland Haeder Date: Thu, 3 Sep 2015 11:38:58 +0000 (+0200) Subject: Refacturing towards JSF/EJB: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=94975138460e99c05dac20bb1681d586694cfe2c;p=pizzaservice-war.git Refacturing towards JSF/EJB: - renamed and prepared JSPs to XHTML (JSF) - updated jcore, jsfcore and jshop - added own validator for privacy/terms checkboxes - still the "mini basket" is not functional yet, maybe it will come as a template? - introduced guest_base.tpl for all "guest" pages Signed-off-by:Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index a123dfa5..526b59ec 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jsfcore.jar b/lib/jsfcore.jar index caff7700..e49e7da8 100644 Binary files a/lib/jsfcore.jar and b/lib/jsfcore.jar differ diff --git a/lib/jshop.jar b/lib/jshop.jar index de624690..6f80ece3 100644 Binary files a/lib/jshop.jar and b/lib/jshop.jar differ diff --git a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java index da3ff07d..c9f0ee24 100644 --- a/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java +++ b/src/java/org/mxchange/pizzaapplication/application/PizzaServiceApplication.java @@ -127,6 +127,7 @@ public class PizzaServiceApplication extends BasePizzaServiceSystem implements P } @Override + @Deprecated public String getPrintableProduktAvailability (final Product product) { // Trace message this.getLogger().trace(MessageFormat.format("product={0} - CALLED!", product)); //NOI18N diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 98b67932..d7b1bde5 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -3,4 +3,8 @@ 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"> + + PrivacyTermsCheckboxValidator + org.mxchange.jsfcore.validator.bool.privacy_terms.PrivacyTermsCheckboxValidator + diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 4577b9ae..d045118d 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -3,11 +3,10 @@ - + Your page's title here diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index bfaffe8a..7c5763ff 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -14,13 +14,11 @@
- -
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl new file mode 100644 index 00000000..18b0d360 --- /dev/null +++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl @@ -0,0 +1,15 @@ + + + + + + + + + diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl new file mode 100644 index 00000000..5d8856b0 --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -0,0 +1,13 @@ + + + + diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl new file mode 100644 index 00000000..a0a719bd --- /dev/null +++ b/web/WEB-INF/templates/guest/guest_login_form.tpl @@ -0,0 +1,48 @@ + +
+ +
+
+ Bitte geben Sie Ihre Kundennummer und Passwort ein: +
+ +
+ Bitte Daten eingeben: + +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ +
+ + +
+
+ +
+ diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index cfaaae02..0e4d7180 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -7,6 +7,7 @@
Home
+
    • @@ -16,6 +17,7 @@
    Kundenlogin
    +
      • diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 1d88bf7b..fe867e30 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -44,6 +44,8 @@ Log4jServletFilter org.apache.logging.log4j.web.Log4jServletFilter + Log4jServletFilter /* diff --git a/web/customer/login.jsp b/web/customer/login.jsp deleted file mode 100644 index 0a5ad316..00000000 --- a/web/customer/login.jsp +++ /dev/null @@ -1,53 +0,0 @@ -<%-- - Document : login - Created on : 11.08.2015, 11:35:53 - Author : Roland Haeder ---%> - -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Pizza-Service - Einloggen - - - - - - - -
      -
      -

      Einloggen als bestehender Kunde:

      -
      - -
      -
      - Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden. -
      - -
      - -
      - -
      - Passwort vergessen? -
      -
      -
      - - - - diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml new file mode 100644 index 00000000..ab2c954d --- /dev/null +++ b/web/customer/login.xhtml @@ -0,0 +1,39 @@ + + + + + + Einloggen + + + + + + + Zum Kundenbereich einloggen + + + +
      + Noch kein Kunde? Einfach beim Bestellen anmelden oder hier anmelden. +
      + +
      +
      + +
      + +
      +       + + + + +       + diff --git a/web/customer/lost_passwd.jsp b/web/customer/lost_passwd.jsp deleted file mode 100644 index 7d5eb779..00000000 --- a/web/customer/lost_passwd.jsp +++ /dev/null @@ -1,93 +0,0 @@ -<%-- - Document : lost_passwd - Created on : 11.08.2015, 11:35:53 - Author : Roland Haeder ---%> - -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Pizza-Service - Passwort vergessen - - - - - - - -
      -
      -

      Passwort vergessen:

      -
      - -
      -
      - Sie haben Ihr Passwort vergessen? -
      - -
      -
      -
      -
      -
      - Bitte geben Sie Ihre Kundennummer oder eMail-Adresse ein: -
      - -
      - Bitte Daten eingeben: - -
      -
      - Kundennummer: -
      -
      - -
      - -
      -
      - -
      - ... oder ... -
      - -
      -
      - eMail-Adresse: -
      -
      - -
      -
      -
      - -
      - -
      - - - -
      -
      -
      -
      -
      -
      -
      - - - - diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml new file mode 100644 index 00000000..e08d28cb --- /dev/null +++ b/web/customer/lost_passwd.xhtml @@ -0,0 +1,75 @@ + + + + + + Passwort vergessen + + + + + + + Stellen Sie Ihr Passwort wieder her. + + + +
      + +
      +
      + Sie haben Ihr Passwort vergessen? +
      + +
      + Bitte Daten eingeben: + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      + ... oder ... +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      + +
      + + +
      +
      +       +
      +       + + + + +       + diff --git a/web/customer/register.jsp b/web/customer/register.jsp deleted file mode 100644 index dc37728a..00000000 --- a/web/customer/register.jsp +++ /dev/null @@ -1,291 +0,0 @@ -<%-- - Document : register - Created on : 11.08.2015, 11:56:22 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Pizza-Service - Neukunde - - - - - - - -
      -
      -

      Anmelden zum Pizza-Service:

      -
      - -
      -
      - Sie sind bereits Kunde? Dann hier einloggen. -
      - -
      -
      -
      - Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: -
      - -
      -
      - Bitte Ihre Daten eingeben: - -
      -
      - -
      - -
      - - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      - -
      -
      - -
      - -
      - -
      - -
      -
      -
      -
      - -
      -
      - Email-Adresse und Passwort: - -
      -
      - eMail-Adresse eingeben: -
      - -
      - -
      - -
      -
      - -
      -
      - eMail-Adresse wiederholen: -
      - -
      - -
      - -
      -
      - -
      - -
      -
      - Passwort eingeben: -
      - -
      - -
      - -
      -
      - -
      -
      - Passwort wiederholen: -
      - -
      - -
      - -
      -
      - -
      - Die Kundennummer wird Ihnen später vergeben. -
      -
      -
      - -
      -
      - Rechtliches: - -
      -
      - -
      - -
      - Ja, ich habe die Datenschutzbestimmungen gelesen und - auch verstanden. -
      - -
      -
      - -
      -
      - -
      - -
      - Ja, ich habe die Allgemeinen Geschäftsbedingungen gelesen und - auch verstanden. -
      - -
      -
      -
      -
      - -
      - - -
      -
      -
      -
      -
      - - - - diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml new file mode 100644 index 00000000..82ecef8e --- /dev/null +++ b/web/customer/register.xhtml @@ -0,0 +1,283 @@ + + + + + + Neukunde + + + + + + + Anmelden zum Pizza-Service: + + + +
      + Sie sind bereits Kunde? Dann einloggen. +
      + + +
      +
      + Anmelden als Neukunde +
      + +
      + Bitte geben Sie mindestens Name, Anschrift und Telefonnummer ein: +
      + +
      +
      + Bitte Ihre Daten eingeben: + +
      +
      + +
      + +
      + + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      +
      +
      + +
      +
      + Email-Adresse und Passwort: + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      +
      + +
      + +
      + +
      + +
      +
      + +
      + Die Kundennummer wird Ihnen später vergeben. +
      +
      +
      + +
      +
      + Rechtliches: + +
      +
      + + + +
      + +
      + Ja, ich habe die gelesen und + auch verstanden. +
      + +
      +
      + +
      +
      + + + +
      + +
      + Ja, ich habe die gelesen und + auch verstanden. +
      + +
      +
      +
      +
      + +
      + + +
      +
      +       +       + + + + +       + diff --git a/web/imprint.xhtml b/web/imprint.xhtml index be755270..f7512adf 100644 --- a/web/imprint.xhtml +++ b/web/imprint.xhtml @@ -7,7 +7,7 @@ xmlns:f="http://xmlns.jcp.org/jsf/core" > - + Impressum diff --git a/web/index.xhtml b/web/index.xhtml index 08cf9c63..6e9ce0ff 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -12,7 +12,7 @@ xmlns:basket="http://mxchange.org/jshop/tags/basket" //--> - + Willkommen! @@ -26,8 +26,6 @@