updated jcore-ee-logger.jar, jshop-ee-lib.jar + added some stuff + renamed variable...

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

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 3e788337a890557ed0c1448c736d39a5d5ed6013..8e850ee73bb42819f966b38fbe8e71ca9578849a 100644 (file)
Binary files a/lib/jcore-ee-logger.jar and b/lib/jcore-ee-logger.jar differ

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index f1e16d8efd7560b53050bbd1a732928a58d38f4e..20f5ad35259d4372e48d742253f2703a65443137 100644 (file)
Binary files a/lib/jshop-ee-lib.jar and b/lib/jshop-ee-lib.jar differ

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
index cbaf01b30486bc886b594fab70e3223ba873443e..c184dbcf4fb2d503cb2c5f78f887c24eb9606299 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java
@@ -17,7 +17,9 @@
 package org.mxchange.pizzaapplication.beans.controller;
 
 import java.rmi.RemoteException;
+import java.sql.SQLException;
 import java.util.Deque;
+import java.util.Queue;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
 import javax.faces.FacesException;
@@ -77,7 +79,7 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
        }
 
        @Override
-       public Deque<Product> getAvailableProducts () throws FacesException {
+       public Queue<Product> getAvailableProducts () throws FacesException {
                try {
                        return this.getProduct().getAvailableProducts();
                } catch (final RemoteException ex) {
@@ -87,7 +89,7 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
        }
 
        @Override
-       public Deque<Category> getAllCategories () throws FacesException {
+       public Queue<Category> getAllCategories () throws FacesException {
                try {
                        // Fake zero category
                        Category c = new ProductCategory(0L, "Ist oberste Kategorie", 0L);
@@ -100,7 +102,7 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe
 
                        // Return it
                        return deque;
-               } catch (final RemoteException ex) {
+               } catch (final SQLException ex) {
                        // Continue to throw
                        throw new FacesException(ex);
                }

diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
index d58d0449e4ee7d8244cc1a129bd534326981dac4..24117527004508c90060d2341822866225d3bd01 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java
@@ -17,7 +17,7 @@
 package org.mxchange.pizzaapplication.beans.controller;
 
 import java.io.Serializable;
-import java.util.Deque;
+import java.util.Queue;
 import javax.faces.view.facelets.FaceletException;
 import org.mxchange.jshopcore.model.category.Category;
 import org.mxchange.jshopcore.model.product.Product;
@@ -35,7 +35,7 @@ public interface PizzaWebBean extends Serializable {
         * @return Only available products
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
-       public Deque<Product> getAvailableProducts () throws FaceletException;
+       public Queue<Product> getAvailableProducts () throws FaceletException;
 
        /**
         * Some "getter" for a linked list of all categories
@@ -43,5 +43,5 @@ public interface PizzaWebBean extends Serializable {
         * @return All categories
         * @throws javax.faces.view.facelets.FaceletException If anything went wrong
         */
-       public Deque<Category> getAllCategories () throws FaceletException;
+       public Queue<Category> getAllCategories () throws FaceletException;
 }

diff --git a/web/WEB-INF/beans.xml b/web/WEB-INF/beans.xml
new file mode 100644 (file)
index 0000000..0f4e2aa
--- /dev/null
+++ b/web/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans 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/beans_1_1.xsd"
+          bean-discovery-mode="all">
+</beans>

diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
index 5c3bb91da0ca1081614eddf150c5a0eb21dbde31..e3c4ad2657fa410ceaa8d712da84b0133a832ca8 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
+++ b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl
@@ -5,6 +5,6 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <h:selectOneMenu class="select" id="parent_id">
-               <f:selectItems value="#{controller.allCategories}" var="categoryId" itemValue="#{categoryId.categoryId}" itemLabel="#{categoryId.title}" />
+               <f:selectItems value="#{controller.allCategories}" var="parent_category" itemValue="#{parent_category.categoryId}" itemLabel="#{parent_category.title}" />
        </h:selectOneMenu>
 </ui:composition>