From: Roland Haeder <roland@mxchange.org>
Date: Wed, 9 Sep 2015 13:41:51 +0000 (+0200)
Subject: updated jcore-ee-logger.jar, jshop-ee-lib.jar + added some stuff + renamed variable... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fd5a4cc816eb64e69093320ae114cfce3629e3a7;p=pizzaservice-war.git

updated jcore-ee-logger.jar, jshop-ee-lib.jar + added some stuff + renamed variable + added beans.xml
Signed-off-by:Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 3e788337..8e850ee7 100644
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 f1e16d8e..20f5ad35 100644
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 cbaf01b3..c184dbcf 100644
--- 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 d58d0449..24117527 100644
--- 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
index 00000000..0f4e2aab
--- /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 5c3bb91d..e3c4ad26 100644
--- 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>