From fd5a4cc816eb64e69093320ae114cfce3629e3a7 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Wed, 9 Sep 2015 15:41:51 +0200
Subject: [PATCH] =?utf8?q?updated=20jcore-ee-logger.jar,=20jshop-ee-lib.ja?=
 =?utf8?q?r=20+=20added=20some=20stuff=20+=20renamed=20variable=20+=20adde?=
 =?utf8?q?d=20beans.xml=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxch?=
 =?utf8?q?ange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/jcore-ee-logger.jar                       | Bin 7793 -> 8032 bytes
 lib/jshop-ee-lib.jar                          | Bin 7348 -> 7375 bytes
 .../beans/controller/PizzaServiceWebBean.java |   8 +++++---
 .../beans/controller/PizzaWebBean.java        |   6 +++---
 web/WEB-INF/beans.xml                         |   6 ++++++
 .../admin_parent_category_selection_box.tpl   |   2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)
 create mode 100644 web/WEB-INF/beans.xml

diff --git a/lib/jcore-ee-logger.jar b/lib/jcore-ee-logger.jar
index 3e788337a890557ed0c1448c736d39a5d5ed6013..8e850ee73bb42819f966b38fbe8e71ca9578849a 100644
GIT binary patch
delta 768
zcmY+C%TE(g6vn?hEuD6Hi%_72>4PGOw1_RJjI|Gns1PYiY+~XwjLq2CR7gr=494if
zjc&BLF>ZBfB8d@WXrliEacNwracz7hZaufwh>LrE-<*8soVhpWTlzzmFV5TS8sG%h
z*Xlf~JX@<9j}+2d5gETnDT)v?Bu=x8#6vbC@s1rQYz!;sndBYYpk4B*I<82*cl~rq
zzV#YP=lWW7)-!PG>w`8xo@w#XYlstJkGR<5GG;WW=$9d)VE{Wd3}VOyj$KX+tJtk!
z1W`9)7<FS0#@yJ8xQfI^z2_4v?LY^|I3`r=<JgY_DkeF6FgQGDXXq}Pm5No(+(_Jv
zj74Uq^ZBDk1{gZZ<~1{3F_%m6lb6a?v8Li6M-qorq&U*ZsK|0mA*W)R<1i+~V}DNk
z@V{8{H!Ew_^;&$vT3t0u*0Gi9RkOz6xZD!Sk^H~*g<AE>aw&CgTk6lmRCHUa<zna;
zPk6tRp{-Umi<YQ#=`1GJeKE1sdm+H-i2w$#yc;QnG~J(Kr<m&-y5*%@J8Tq3U`LdE
zF?7)vCkIG%qld`odHht{NqPwmQsj@lM4Q)Pe*^W5ZM3inX9F$;qYY>b4Y(Oz!L|we
zbMh+G7toq@aq5+5&hSA=%SNpsQuU&bhUqPHfEc915Td9cyg1L4Zrk7G6COQD+b8Dq
z9IcJGrza#{Q<CsYpOwf379{Qm3KE|KXPe1jR^oPWQerb$ln8~&5_dx@?f>tdaD*+#
I7x_>44WZ7dng9R*

delta 572
zcmY+BO-oc!7{~wT+{>J~caAeU<BT)+&DR|7wS38!i<F`W3QD915pjb++_Z69o7(gR
z<PhzG77@}W5+WCV2hp9lP#5lt+6DPMqb*vT|L-}^>)||Sb3g9uwN=Y@fjr=4J35w)
zY$tsu$v*61{TY**P^64UVwUk%EHX~S3Sn<hW`g;~>bIG@YFsi;onLw8Q8|?zUKTGO
zoMiq78{o5G&daHZ>dHK>mXawK4g!|YMTBk_J?M4lO??IQW1xUr7*uE~4DG$IUWhS`
zHjNmG!m!3|+))_Os9;pXML~h$<G8CZp)rX>;GTIH^qP`ep@EKBcPge?|0)vmtd^LM
zji-K|1_J_RE+<QpO(RH)CiDhgm&jLyMcRaoA<B!<PB%>%pt&97;ra?XskTV=65S-R
zJiL#bz&@0~H(1|ce<7~~cg(e_M_Qd~*V#9ns18-sDBeYRZXX5fWHjgqc%%~k+NzM9
z*1yG>Ki&*&&ZPc4eYtt*k1;;`GmJ}rnK2qXV7v-87{|ermNT4VY=_f~PvIs*N6#5A
SqV3}Udo#bIt=wOJ2d)4MC0|Vd

diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar
index f1e16d8efd7560b53050bbd1a732928a58d38f4e..20f5ad35259d4372e48d742253f2703a65443137 100644
GIT binary patch
delta 533
zcmY+>%PT}t90%~<IR|&<x^pMPeQ{-Wx;7*4$@?)Oj~G@KYEsA}Nl_+6lCshGE$n0=
z$zwH^Hp-H)mp?#Ru(EW17in(&&gb0I@7#O8=U&Gj<J!o8$Ws9V02k?u=JE4%rty%=
z`BRj}Pfw0m&SJzct0#6?D{;qq2$k0o?L1Db^A5>@sK&`qAm`x+qKg`OM5iRXE1EcY
zo4+r}WH7;tF4A6acB86tmjh5GFctK0I^>{U5LRskA_^2MP=dF?i9ACA6H}Te6tJ>;
z+9nG#Fy>OLso2W$LTqew5SiW*ECdYzID~M~u+{&l*;##x(Tg9#kN$@oMLtN(7;$+9
zcyCY+)Xi$5!}P<Y&33xGF%yKahKQs!PMlfY#Jkl`G}$A>tL@^c-S9I_5;e{!vEwWg
zU(O;iQ@R?;$&PQO(@|P^-WD2XGJvdv4DxrKY^~||oL_<aWp#d|bJ=Xp%Oj)e`|FaP
jY`uj2#-)+~s;>VVn_ZV*MSfSK*j5(6V^=RYGHBm7(rlSO

delta 478
zcmX?axy6zvz?+$ci-CcIfninjL>^71mC+N;r!xWB7ZgC`CruzZS(Z^BMENnAf~ZzT
zTM%`G(FH_tF&Tp>dnQW|RmJ20q$V*NOg<pRfnxY1W+#vW7iLEwwYi<yf(b+)WbJ1L
z(LtQ9Onj@NHQkGxm5%2yF)-vXP44GY0huz{L0W$D2X4;E-U2+64|7Jah_Ew=PEO>}
z+}z94z&Kfz&zPNqft!JWfobwoAtjJu&3ws>Ao>OWd9Worg+7Al$!kO{f&QEPTomNS
z$(mvYASzl6?C@z~_8{JMF;@^JC+-WPa>YYH)M0UF5XB+k38I1}0zlMH37N?UCCnhq
zAQ0s%83>{lNEU)9VX0gY)g)EMi{h`ztkP*9iCk$JrWn4-7g^;e>oaps-pwaJIbNCv
zB=Z0$bC4e_BP(OB0Mh-ZmtSB4FjPR;8R%6QSkgF22&#}{@&_Tg$vb5P*qTK_(f}{?
Bk@)}s

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>
-- 
2.39.5